[Orxonox-commit 810] r3331 - trunk/src/core/input

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-07-21 12:08:59 +0200 (Tue, 21 Jul 2009)
New Revision: 3331

Modified:
   trunk/src/core/input/InputManager.cc
Log:
Minor problem with exception catching.

Modified: trunk/src/core/input/InputManager.cc
===================================================================
--- trunk/src/core/input/InputManager.cc	2009-07-21 09:53:13 UTC (rev 3330)
+++ trunk/src/core/input/InputManager.cc	2009-07-21 10:08:59 UTC (rev 3331)
@@ -207,7 +207,7 @@
             // Successful initialisation
             guard.Dismiss();
         }
-        catch (std::exception& ex)
+        catch (const std::exception& ex)
         {
             oisInputManager_ = NULL;
             internalState_ |= Bad;
@@ -233,9 +233,9 @@
             {
                 devices_[InputDeviceEnumerator::Mouse] = new Mouse(InputDeviceEnumerator::Mouse, oisInputManager_);
             }
-            catch (const OIS::Exception& ex)
+            catch (const std::exception& ex)
             {
-                CCOUT(2) << "Warning: Failed to create Mouse:" << ex.eText << std::endl
+                CCOUT(2) << "Warning: Failed to create Mouse:" << ex.what() << std::endl
                          << "Proceeding without mouse support." << std::endl;
             }
         }
@@ -252,7 +252,7 @@
             {
                 devices_.push_back(new JoyStick(InputDeviceEnumerator::FirstJoyStick + i, oisInputManager_));
             }
-            catch (std::exception ex)
+            catch (const std::exception& ex)
             {
                 CCOUT(2) << "Warning: Failed to create joy stick: " << ex.what() << std::endl;
             }