Fail gracefully if main_menu_script has bad value (#10938)

Builtin: Move :close() before dofile

diff --git a/builtin/init.lua b/builtin/init.lua
index 75bb3db8507cbf2bf26f929ac8ad947660c50e39..89b1fdc645f5b75e10696f1fea72219a4e1caae4 100644 (file)
--- a/builtin/init.lua
+++ b/builtin/init.lua
@@ -39,9 +39,20 @@ if INIT == "game" then
        assert(not core.get_http_api)
 elseif INIT == "mainmenu" then
        local mm_script = core.settings:get("main_menu_script")
+       local custom_loaded = false
        if mm_script and mm_script ~= "" then
-               dofile(mm_script)
-       else
+               local testfile = io.open(mm_script, "r")
+               if testfile then
+                       testfile:close()
+                       dofile(mm_script)
+                       custom_loaded = true
+                       core.log("info", "Loaded custom main menu script: "..mm_script)
+               else
+                       core.log("error", "Failed to load custom main menu script: "..mm_script)
+                       core.log("info", "Falling back to default main menu script")
+               end
+       end
+       if not custom_loaded then
                dofile(core.get_mainmenu_path() .. DIR_DELIM .. "init.lua")
        end
 elseif INIT == "async" then