Fix world deletion (#7494)

* Fix world deletion

diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp
index a5b211bc7b94992663e1de27532523f8d5d82d38..238e3e32f0b669e868fbc1a19598a220cbd79a24 100644 (file)
--- a/src/script/lua_api/l_mainmenu.cpp
+++ b/src/script/lua_api/l_mainmenu.cpp
@@ -594,31 +594,18 @@ int ModApiMainMenu::l_create_world(lua_State *L)
 /******************************************************************************/
 int ModApiMainMenu::l_delete_world(lua_State *L)
 {
-       int worldidx    = luaL_checkinteger(L,1) -1;
-
+       int world_id = luaL_checkinteger(L, 1) - 1;
        std::vector<WorldSpec> worlds = getAvailableWorlds();
-
-       if ((worldidx >= 0) &&
-               (worldidx < (int) worlds.size())) {
-
-               WorldSpec spec = worlds[worldidx];
-
-               std::vector<std::string> paths;
-               paths.push_back(spec.path);
-               fs::GetRecursiveSubPaths(spec.path, paths, true);
-
-               // Delete files
-               if (!fs::DeletePaths(paths)) {
-                       lua_pushstring(L, "Failed to delete world");
-               }
-               else {
-                       lua_pushnil(L);
-               }
-       }
-       else {
+       if (world_id < 0 || world_id >= (int) worlds.size()) {
                lua_pushstring(L, "Invalid world index");
+               return 1;
        }
-       return 1;
+       const WorldSpec &spec = worlds[world_id];
+       if (!fs::RecursiveDelete(spec.path)) {
+               lua_pushstring(L, "Failed to delete world");
+               return 1;
+       }
+       return 0;
 }
 
 /******************************************************************************/