Skip to content
Permalink
Browse files

Fix delayed error message in start game tab

  • Loading branch information
rubenwardy committed Apr 11, 2020
1 parent af2e6a6 commit 3833396cfad7289b8c38ab64b69885b409d993ce
Showing with 24 additions and 29 deletions.
  1. +24 −29 builtin/mainmenu/tab_local.lua
@@ -207,40 +207,35 @@ local function main_button_handler(this, fields, name, tabdata)
local selected = core.get_textlist_index("sp_worlds")
gamedata.selected_world = menudata.worldlist:get_raw_index(selected)

if core.settings:get_bool("enable_server") then
if selected ~= nil and gamedata.selected_world ~= 0 then
gamedata.playername = fields["te_playername"]
gamedata.password = fields["te_passwd"]
gamedata.port = fields["te_serverport"]
gamedata.address = ""

core.settings:set("port",gamedata.port)
if fields["te_serveraddr"] ~= nil then
core.settings:set("bind_address",fields["te_serveraddr"])
end
if selected == nil or gamedata.selected_world == 0 then
gamedata.errormessage =
fgettext("No world created or selected!")
return true
end

--update last game
local world = menudata.worldlist:get_raw_element(gamedata.selected_world)
if world then
local game = pkgmgr.find_by_gameid(world.gameid)
core.settings:set("menu_last_game", game.id)
end
-- Update last game
local world = menudata.worldlist:get_raw_element(gamedata.selected_world)
if world then
local game = pkgmgr.find_by_gameid(world.gameid)
core.settings:set("menu_last_game", game.id)
end

core.start()
else
gamedata.errormessage =
fgettext("No world created or selected!")
if core.settings:get_bool("enable_server") then
gamedata.playername = fields["te_playername"]
gamedata.password = fields["te_passwd"]
gamedata.port = fields["te_serverport"]
gamedata.address = ""

core.settings:set("port",gamedata.port)
if fields["te_serveraddr"] ~= nil then
core.settings:set("bind_address",fields["te_serveraddr"])
end
else
if selected ~= nil and gamedata.selected_world ~= 0 then
gamedata.singleplayer = true
core.start()
else
gamedata.errormessage =
fgettext("No world created or selected!")
end
return true
gamedata.singleplayer = true
end

core.start()
return true
end

if fields["world_create"] ~= nil then

0 comments on commit 3833396

Please sign in to comment.