Changeset 8485 for code/trunk

Timestamp:

May 14, 2011, 5:44:09 PM (13 years ago)

Author:

dafrick

Message:

Now it should work in all cases.

File:

• code/trunk/data/gui/scripts/SheetManager.lua (modified) (1 diff)

code/trunk/data/gui/scripts/SheetManager.lua

@@ -216 +216 @@
 function keyESC()
     -- HUGE, very HUGE hacks!
-
-    -- Count the number of sheets that don't need input till the first that does.
-    local counter = noInputSheetIndex()
     
     -- If the InGameConsole is active, ignore the ESC command.
     if bInGameConsoleClosed == true then
         bInGameConsoleClosed = false
-        if counter > 0 then
+        if activeMenuSheets[1].sheet.name == "MainMenu" then
             return
         end
     end
+
+    -- Count the number of sheets that don't need input till the first that does.
+    local counter = noInputSheetIndex()
 
     -- If the first sheet that needs input is the MainMenu.