From: sapier <Sapier at GMX dot net>
Date: Sat, 14 Jun 2014 09:45:12 +0000 (+0200)
Subject: Fix regression main_menu_script setting not working any longer
X-Git-Tag: 0.4.10~83
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F1372%2Fhead;p=oweals%2Fminetest.git

Fix regression main_menu_script setting not working any longer
---

diff --git a/builtin/init.lua b/builtin/init.lua
index 4f55e8034..6fc1bf6d5 100644
--- 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