[Orxonox-commit 2004] r6721 - code/branches/gamestates2/data/gui/scripts

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-04-13 17:58:55 +0200 (Tue, 13 Apr 2010)
New Revision: 6721

Modified:
   code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua
Log:
Fixed cross hair showing in in game menu.

Modified: code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua	2010-04-13 13:58:56 UTC (rev 6720)
+++ code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua	2010-04-13 15:58:55 UTC (rev 6721)
@@ -94,6 +94,12 @@
         assert(bHidePrevious ~= nil)
     end
 
+    -- Pause game control if this is the first menu to be displayed
+    -- HUGE HACK?
+    if activeMenuSheets.size == 0 then
+        orxonox.HumanController:pauseControl()
+    end
+
     -- Hide if already displayed (to make sure it is up front in the end)
     if activeMenuSheets[name] ~= nil then
         hideGUI(name)
@@ -117,12 +123,6 @@
     -- Add sheet to the root window
     root:addChildWindow(menuSheet.window)
 
-    -- Pause game control if this is the first menu to be displayed
-    -- HUGE HACK?
-    if activeMenuSheets.size == 0 then
-        orxonox.HumanController:pauseControl()
-    end
-
     -- Handle input distribution
     orxonox.InputManager:getInstance():enterState(menuSheet.inputState)