[Supertuxkart-commit] SF.net SVN: supertuxkart:[7211] main/trunk/src/states_screens/challenges. cpp

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

Revision: 7211
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=7211&view=rev
Author:   auria
Date:     2011-01-01 22:11:15 +0000 (Sat, 01 Jan 2011)

Log Message:
-----------
Make code more robust to print an error message instead of crashing in weird case reproduced by Arthur_D only

Modified Paths:
--------------
    main/trunk/src/states_screens/challenges.cpp

Modified: main/trunk/src/states_screens/challenges.cpp
===================================================================
--- main/trunk/src/states_screens/challenges.cpp	2011-01-01 21:29:55 UTC (rev 7210)
+++ main/trunk/src/states_screens/challenges.cpp	2011-01-01 22:11:15 UTC (rev 7211)
@@ -138,6 +138,13 @@
                 UserConfigParams::m_default_kart.revertToDefaults();
             }
             
+            const Challenge* c = unlock_manager->getChallenge(selection);
+            if (c == NULL)
+            {
+                std::cerr << "[ChallengesScreen] ERROR: cannot find challenge '" << selection.c_str() << "'!\n";
+                return;
+            }
+            
             // Use latest used device
             InputDevice* device = input_manager->getDeviceList()->getLatestUsedDevice();
             
@@ -160,7 +167,7 @@
             network_manager->initCharacterDataStructures();
             
             // Launch challenge
-            unlock_manager->getChallenge(selection)->setRace();
+            c->setRace();
 
             // Sets up kart info, including random list of kart for AI
             network_manager->setupPlayerKartInfo();


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