[Orxonox-commit 3324] r8013 - in code/branches/usability: data/gui/scripts src/orxonox/overlays

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-03-03 16:24:37 +0100 (Thu, 03 Mar 2011)
New Revision: 8013

Modified:
   code/branches/usability/data/gui/scripts/SheetManager.lua
   code/branches/usability/src/orxonox/overlays/InGameConsole.cc
Log:
Fixed bug occurred during bugfix (new bug is worse) by reverse merging r7985.

Modified: code/branches/usability/data/gui/scripts/SheetManager.lua
===================================================================
--- code/branches/usability/data/gui/scripts/SheetManager.lua	2011-03-03 15:18:34 UTC (rev 8012)
+++ code/branches/usability/data/gui/scripts/SheetManager.lua	2011-03-03 15:24:37 UTC (rev 8013)
@@ -4,7 +4,7 @@
 local loadedSheets = {}
 local activeMenuSheets = {size = 0, topSheetTuple = nil}
 local menuSheetsRoot = guiMgr:getMenuRootWindow()
-local bInGameConsoleOpen = false
+local bInGameConsoleClosed = false
 local mainMenuLoaded = false
 orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "KeyDown", "keyPressed")
 
@@ -220,7 +220,8 @@
     -- HUGE, very HUGE hacks!
 
     -- If the InGameConsole is active, ignore the ESC command.
-    if bInGameConsoleOpen then
+    if bInGameConsoleClosed == true then
+        bInGameConsoleClosed = false
         return
     end
 
@@ -277,12 +278,8 @@
     return counter
 end
 
-function inGameConsoleOpened()
-    bInGameConsoleOpen = true
-end
-
 function inGameConsoleClosed()
-    bInGameConsoleOpen = false
+    bInGameConsoleClosed = not bInGameConsoleClosed;
 end
 
 ----------------------

Modified: code/branches/usability/src/orxonox/overlays/InGameConsole.cc
===================================================================
--- code/branches/usability/src/orxonox/overlays/InGameConsole.cc	2011-03-03 15:18:34 UTC (rev 8012)
+++ code/branches/usability/src/orxonox/overlays/InGameConsole.cc	2011-03-03 15:24:37 UTC (rev 8013)
@@ -512,7 +512,6 @@
         {
             this->bActive_ = true;
             InputManager::getInstance().enterState("console");
-            GUIManager::getInstance().getLuaState()->doString("inGameConsoleOpened()"); // Notify the SheetManager in lua, that the console has been closed.
             this->shell_->registerListener(this);
 
             this->windowResized(this->windowW_, this->windowH_);
@@ -611,6 +610,7 @@
     */
     /*static*/ void InGameConsole::closeConsole()
     {
+        GUIManager::getInstance().getLuaState()->doString("inGameConsoleClosed()");  // Notify the SheetManager in lua, that the console has been closed, but not by ESC.
         InGameConsole::getInstance().deactivate();
     }