Changeset 8013 for code/branches/usability/data/gui

Timestamp:

Mar 3, 2011, 4:24:37 PM (14 years ago)

Author:

rgrieder

Message:

Fixed bug occurred during bugfix (new bug is worse) by reverse merging r7985.

File:

• code/branches/usability/data/gui/scripts/SheetManager.lua (modified) (3 diffs)

code/branches/usability/data/gui/scripts/SheetManager.lua

@@ -5 +5 @@
 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")
@@ -221 +221 @@
 
     -- If the InGameConsole is active, ignore the ESC command.
-    if bInGameConsoleOpen then
+    if bInGameConsoleClosed == true then
+        bInGameConsoleClosed = false
         return
     end
@@ -278 +279 @@
 end
 
-function inGameConsoleOpened()
-    bInGameConsoleOpen = true
-end
-
 function inGameConsoleClosed()
-    bInGameConsoleOpen = false
+    bInGameConsoleClosed = not bInGameConsoleClosed;
 end