diff options
author | jp <jeanpatrick.guerrero@gmail.com> | 2015-07-04 17:53:00 +0200 |
---|---|---|
committer | kwolekr <kwolekr@minetest.net> | 2015-07-10 16:52:57 -0400 |
commit | c3dead719ae737a2e61f7e0e81cfc1b614790edd (patch) | |
tree | 087dc0aef8970a82cd043c2749490f9b4bd25ffb /builtin/mainmenu/tab_server.lua | |
parent | 1a1774a1051790ef85b1bd8b047ac45a3676b5d6 (diff) | |
download | minetest-c3dead719ae737a2e61f7e0e81cfc1b614790edd.tar.gz minetest-c3dead719ae737a2e61f7e0e81cfc1b614790edd.tar.bz2 minetest-c3dead719ae737a2e61f7e0e81cfc1b614790edd.zip |
Fix remnant bugs on mainmenu
- Stop attempting to start a world when no world's created/selected in server tab
- Better world's indexes handling between subgames lists
Diffstat (limited to 'builtin/mainmenu/tab_server.lua')
-rw-r--r-- | builtin/mainmenu/tab_server.lua | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/builtin/mainmenu/tab_server.lua b/builtin/mainmenu/tab_server.lua index 62747c572..d08eecc21 100644 --- a/builtin/mainmenu/tab_server.lua +++ b/builtin/mainmenu/tab_server.lua @@ -113,12 +113,12 @@ local function main_button_handler(this, fields, name, tabdata) world_doubleclick or fields["key_enter"] then local selected = core.get_textlist_index("srv_worlds") - if selected ~= nil then + gamedata.selected_world = menudata.worldlist:get_raw_index(selected) + 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 = "" - gamedata.selected_world = menudata.worldlist:get_raw_index(selected) core.setting_set("port",gamedata.port) if fields["te_serveraddr"] ~= nil then @@ -133,8 +133,11 @@ local function main_button_handler(this, fields, name, tabdata) end core.start() - return true + else + gamedata.errormessage = + fgettext("No world created or selected!") end + return true end if fields["world_create"] ~= nil then |