- Fix issue 694

- Bump version number to 0.16.0 for upcoming release

projects/mtg/src/DeckStats.cpp

@@ -123,8 +123,14 @@ void DeckStats::load(const std::string& filename)
         int deckId = atoi(filename.substr(filename.find("_deck") + 5, filename.find(".txt")).c_str());
         char buffer[512];
         sprintf(buffer, "deck%i.txt", deckId);
-        string playerDeckFilePath= options.profileFile( buffer);
+        string playerDeckFilePath = options.profileFile( buffer);
         DeckMetaData *playerDeckMetaData = DeckManager::GetInstance()->getDeckMetaDataByFilename( playerDeckFilePath, false);
+        if (!playerDeckMetaData)
+        {
+            DebugTrace("DeckStats.cpp:CONSISTENCY ERROR: DeckStats are set, but no deck meta data");
+            file.close();
+            return;
+        }
         // check if this player deck has already been profiled for manacolors
         char next = file.peek();
         string manaColorIndex = "";

projects/mtg/src/GameStateDuel.cpp

@@ -125,11 +125,11 @@ void GameStateDuel::Start()
             vector<DeckMetaData *> playerDeckList = BuildDeckList(options.profileFile());
             int nbDecks = playerDeckList.size();
 
-            if (nbDecks > 1)
-            {
+            if (nbDecks)
                 decksneeded = 0;
+            
+             if (nbDecks > 1)   
                 deckmenu->Add(MENUITEM_RANDOM_PLAYER, "Random", "Play with a random deck.");
-            }
 
             renderDeckMenu(deckmenu, playerDeckList);
             // save the changes to the player deck list maintained in DeckManager

projects/mtg/src/GameStateMenu.cpp

@@ -25,7 +25,7 @@
 #include <JNetwork.h>
 #endif//NETWORK_SUPPORT
 
-static const char* GAME_VERSION = "WTH?! 0.15.1 - wololo.net";
+static const char* GAME_VERSION = "WTH?! 0.16.0 - wololo.net";
 
 enum ENUM_MENU_STATE_MAJOR
 {