aboutsummaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2014-06-14 11:45:12 +0200
committersapier <Sapier at GMX dot net>2014-06-14 21:20:09 +0200
commit9ffa88b558498a139488679ef2ed8767c8540471 (patch)
treebcfd8e6f4fa283acae0e6a85edb0e2de4cf336e0 /builtin
parent7b3602bab3a697a2729b057c5e8a354337482389 (diff)
downloadminetest-9ffa88b558498a139488679ef2ed8767c8540471.tar.gz
minetest-9ffa88b558498a139488679ef2ed8767c8540471.tar.bz2
minetest-9ffa88b558498a139488679ef2ed8767c8540471.zip
Fix regression main_menu_script setting not working any longer
Diffstat (limited to 'builtin')
-rw-r--r--builtin/init.lua7
1 files changed, 6 insertions, 1 deletions
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