From: Rui <Rui914@users.noreply.github.com>
Date: Thu, 12 May 2016 15:38:29 +0000 (+1000)
Subject: Fix #4111 ("Provided world path doesn't exist" if choosing singleplayer on first... 
X-Git-Tag: 0.4.14~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9d3d43f3340030db8855ebc394e969f10d00dc30;p=oweals%2Fminetest.git

Fix #4111 ("Provided world path doesn't exist" if choosing singleplayer on first run")

Bug and whitespace error fixed (Zeno)
---

diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua
index 6dd345ff4..7f0c1e386 100644
--- a/builtin/mainmenu/init.lua
+++ b/builtin/mainmenu/init.lua
@@ -77,13 +77,28 @@ local function init_globals()
 
 	if PLATFORM == "Android" then
 		local world_list = core.get_worlds()
-		local world_index = table.indexof(world_list, "singleplayerworld")
+		local world_index
+
+		local found_singleplayerworld = false
+		for i, world in ipairs(world_list) do
+			if world.name == "singleplayerworld" then
+				found_singleplayerworld = true
+				world_index = i
+				break
+			end
+		end
 
-		if world_index == -1 then
+		if not found_singleplayerworld then
 			core.create_world("singleplayerworld", 1)
 
 			world_list = core.get_worlds()
-			world_index = table.indexof(world_list, "singleplayerworld")
+
+			for i, world in ipairs(world_list) do
+				if world.name == "singleplayerworld" then
+					world_index = i
+					break
+				end
+			end
 		end
 
 		gamedata.worldindex = world_index