Prevent world creation if the world already exists

diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index 4ceecbb5f0261a83d25bc7c3af7d5a06036d41c9..5e0a3c38f303de7e1a60b3cfa27e812374c35f67 100644 (file)
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -48,10 +48,23 @@ struct CreateWorldDestMainMenu : public CreateWorldDest
        {}
        void accepted(std::wstring name, std::string gameid)
        {
-               if(!string_allowed_blacklist(wide_to_narrow(name), WORLDNAME_BLACKLISTED_CHARS))
+               std::string name_narrow = wide_to_narrow(name);
+               if(!string_allowed_blacklist(name_narrow, WORLDNAME_BLACKLISTED_CHARS))
+               {
                        m_menu->displayMessageMenu(wgettext("Cannot create world: Name contains invalid characters"));
-               else
-                       m_menu->createNewWorld(name, gameid);
+                       return;
+               }
+               std::vector<WorldSpec> worlds = getAvailableWorlds();
+               for(std::vector<WorldSpec>::iterator i = worlds.begin();
+                   i != worlds.end(); i++)
+               {
+                       if((*i).name == name_narrow)
+                       {
+                               m_menu->displayMessageMenu(wgettext("Cannot create world: A world by this name already exists"));
+                               return;
+                       }
+               }
+               m_menu->createNewWorld(name, gameid);
        }
        GUIMainMenu *m_menu;
 };
@@ -936,4 +949,4 @@ int GUIMainMenu::getTab()
 void GUIMainMenu::displayMessageMenu(std::wstring msg)
 {
        (new GUIMessageMenu(env, parent, -1, menumgr, msg))->drop();
-}
\ No newline at end of file
+}