From 9ffa88b558498a139488679ef2ed8767c8540471 Mon Sep 17 00:00:00 2001 From: sapier Date: Sat, 14 Jun 2014 11:45:12 +0200 Subject: [PATCH] Fix regression main_menu_script setting not working any longer --- builtin/init.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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