[Supertuxkart-commit] SF.net SVN: supertuxkart:[8901] main/branches/0.7.2/src/states_screens/ options_screen_video.cpp

[<au...@us...>]

Revision: 8901
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=8901&view=rev
Author:   auria
Date:     2011-06-12 18:51:34 +0000 (Sun, 12 Jun 2011)

Log Message:
-----------
Fixed harmless warning and bogus resolution display in options when viewing from in-game

Modified Paths:
--------------
    main/branches/0.7.2/src/states_screens/options_screen_video.cpp

Modified: main/branches/0.7.2/src/states_screens/options_screen_video.cpp
===================================================================
--- main/branches/0.7.2/src/states_screens/options_screen_video.cpp	2011-06-12 18:51:05 UTC (rev 8900)
+++ main/branches/0.7.2/src/states_screens/options_screen_video.cpp	2011-06-12 18:51:34 UTC (rev 8901)
@@ -106,6 +106,14 @@
     assert( full != NULL );
     full->setState( UserConfigParams::m_fullscreen );
     
+    // Enable back widgets if they were visited in-game previously
+    if (StateManager::get()->getGameState() != GUIEngine::INGAME_MENU)
+    {
+        res->setActivated();
+        full->setActivated();
+        applyBtn->setActivated();
+        gfx->setActivated();
+    }
     
     // --- get resolution list from irrlicht the first time
     if (!m_inited)
@@ -222,23 +230,7 @@
     } // end if not inited
     
     res->updateItemDisplay();
-        
-    // forbid changing resolution or animation settings from in-game
-    if (StateManager::get()->getGameState() == GUIEngine::INGAME_MENU)
-    {
-        res->setDeactivated();
-        full->setDeactivated();
-        applyBtn->setDeactivated();
-        gfx->setDeactivated();
-    }
-    else
-    {
-        res->setActivated();
-        full->setActivated();
-        applyBtn->setActivated();
-        gfx->setActivated();
-    }
-    
+
     // ---- select current resolution every time
     char searching_for[32];
     snprintf(searching_for, 32, "%ix%i", (int)UserConfigParams::m_width, (int)UserConfigParams::m_height);
@@ -266,6 +258,18 @@
         }
     }
     
+    
+    // ---- forbid changing resolution or animation settings from in-game
+    // (we need to disable them last because some items can't be edited when disabled)
+    if (StateManager::get()->getGameState() == GUIEngine::INGAME_MENU)
+    {
+        res->setDeactivated();
+        full->setDeactivated();
+        applyBtn->setDeactivated();
+        gfx->setDeactivated();
+    }
+    
+    
     updateTooltip();
 }   // init
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.