Fix regression main_menu_script setting not working any longer

minetest · Jun 14, 2014 · 9ffa88b · 9ffa88b
1 parent 7b3602b
commit 9ffa88b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/builtin/init.lua b/builtin/init.lua
@@ -23,7 +23,12 @@ dofile(commonpath.."misc_helpers.lua")
 if INIT == "game" then
 	dofile(gamepath.."init.lua")
 elseif INIT == "mainmenu" then
-	dofile(core.get_mainmenu_path()..DIR_DELIM.."init.lua")
+	local mainmenuscript = core.setting_get("main_menu_script")
+	if mainmenuscript ~= nil and mainmenuscript ~= "" then
+		dofile(mainmenuscript)
+	else
+		dofile(core.get_mainmenu_path()..DIR_DELIM.."init.lua")
+	end
 elseif INIT == "async" then
 	dofile(asyncpath.."init.lua")
 else