[Orxonox-commit 3631] r8316 - in code/trunk/src: libraries/core/command orxonox/controllers

[scheusso at orxonox.net]

Author: scheusso
Date: 2011-04-23 23:37:10 +0200 (Sat, 23 Apr 2011)
New Revision: 8316

Modified:
   code/trunk/src/libraries/core/command/ConsoleCommand.cc
   code/trunk/src/orxonox/controllers/NewHumanController.cc
Log:
fix for dedicated Client


Modified: code/trunk/src/libraries/core/command/ConsoleCommand.cc
===================================================================
--- code/trunk/src/libraries/core/command/ConsoleCommand.cc	2011-04-23 20:28:14 UTC (rev 8315)
+++ code/trunk/src/libraries/core/command/ConsoleCommand.cc	2011-04-23 21:37:10 UTC (rev 8316)
@@ -580,7 +580,8 @@
     */
     ConsoleCommand& ConsoleCommand::changeKeybindMode(KeybindMode::Value mode)
     {
-        KeyBinderManager::getInstance().getCurrent()->changeMode(this, mode);
+        if( KeyBinderManager::exists() )
+            KeyBinderManager::getInstance().getCurrent()->changeMode(this, mode);
 
         this->keybindMode(mode);
         return *this;

Modified: code/trunk/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/trunk/src/orxonox/controllers/NewHumanController.cc	2011-04-23 20:28:14 UTC (rev 8315)
+++ code/trunk/src/orxonox/controllers/NewHumanController.cc	2011-04-23 21:37:10 UTC (rev 8316)
@@ -355,7 +355,8 @@
         this->currentYaw_ = 0;
         this->currentPitch_ = 0;
 
-        KeyBinderManager::getInstance().getCurrent()->resetMouseAxes();
+        if( KeyBinderManager::exists() )
+            KeyBinderManager::getInstance().getCurrent()->resetMouseAxes();
     }
 
     void NewHumanController::updateTarget()