Skip to content

Commit

Permalink
Fix single click world select
Browse files Browse the repository at this point in the history
  • Loading branch information
est31 committed Jun 30, 2015
1 parent 85f3d57 commit 29b0dc8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions builtin/mainmenu/common.lua
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ function menu_worldmt(selected, setting, value)
local filename = world.path .. DIR_DELIM .. "world.mt"
local world_conf = Settings(filename)

if value then
if value ~= nil then
if not world_conf:write() then
core.log("error", "Failed to write world config file")
end
Expand All @@ -320,14 +320,14 @@ function menu_worldmt(selected, setting, value)
end
end

function menu_worldmt_legacy()
local modes = {"creative_mode", "enable_damage"}
for _, mode in pairs(modes) do
local mode = menu_worldmt(selected, ""..mode.."")
if mode then
core.setting_set(""..mode.."", mode)
function menu_worldmt_legacy(selected)
local modes_names = {"creative_mode", "enable_damage"}
for _, mode_name in pairs(modes_names) do
local mode_val = menu_worldmt(selected, mode_name)
if mode_val ~= nil then
core.setting_set(mode_name, mode_val)
else
menu_worldmt(selected, ""..mode.."", core.setting_get(""..mode..""))
menu_worldmt(selected, mode_name, core.setting_get(mode_name))
end
end
end
2 changes: 1 addition & 1 deletion builtin/mainmenu/tab_server.lua
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ local function main_button_handler(this, fields, name, tabdata)
local event = core.explode_textlist_event(fields["srv_worlds"])
local selected = core.get_textlist_index("srv_worlds")

menu_worldmt_legacy()
menu_worldmt_legacy(selected)

if event.type == "DCL" then
world_doubleclick = true
Expand Down
2 changes: 1 addition & 1 deletion builtin/mainmenu/tab_singleplayer.lua
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ local function main_button_handler(this, fields, name, tabdata)
local event = core.explode_textlist_event(fields["sp_worlds"])
local selected = core.get_textlist_index("sp_worlds")

menu_worldmt_legacy()
menu_worldmt_legacy(selected)

if event.type == "DCL" then
world_doubleclick = true
Expand Down

0 comments on commit 29b0dc8

Please sign in to comment.