Changeset 8026 for code/branches

Timestamp:

Mar 5, 2011, 11:56:20 PM (14 years ago)

Author:

landauf

Message:

don't show the ogre config dialog again if the new resolution was accepted by the user or if the resolution was changed back to the old settings

File:

• code/branches/usability/data/gui/scripts/GraphicsMenu.lua (modified) (2 diffs)

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

@@ -339 +339 @@
     P.oldFullscreen = orxonox.GraphicsManager:getInstance():isFullScreen()
 
-    P.revertTimerHandle = orxonox.CommandExecutor:query("delayreal 10 \"hideGUI DecisionPopup; GraphicsManager setScreenResolution " .. P.oldWidth .. " " .. P.oldHeight .. " " .. tostring(P.oldFullscreen) .. "\"")
+    P.revertTimerHandle = orxonox.CommandExecutor:query("delayreal 10 {hideGUI DecisionPopup; GraphicsManager setScreenResolution " .. P.oldWidth .. " " .. P.oldHeight .. " " .. tostring(P.oldFullscreen) .. "; config Core lastLevelTimestamp_ [expr [getConfig Core ogreConfigTimestamp_] + 1]}")
 
     -- change settings
@@ -360 +360 @@
         P:onShow()
     end
+
+    -- update timestamp to avoid showing the ogre config dialog again after the user accepted or reverted the resolution
+    orxonox.CommandExecutor:execute("config Core lastLevelTimestamp_ [expr [getConfig Core ogreConfigTimestamp_] + 1]")
 end