From 8970f439b8c18a5543f61999845ed0a33f84666b Mon Sep 17 00:00:00 2001 From: kilbith Date: Tue, 6 Oct 2015 20:14:47 +0200 Subject: [PATCH] Fix vrange min/max adjusting when min exceeds max --- builtin/mainmenu/tab_settings.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/builtin/mainmenu/tab_settings.lua b/builtin/mainmenu/tab_settings.lua index d39030b1d..a00777207 100644 --- a/builtin/mainmenu/tab_settings.lua +++ b/builtin/mainmenu/tab_settings.lua @@ -329,12 +329,7 @@ local function formspec(tabview, name, tabdata) viewing_range_max_to_scrollbar() .. "]" .. "tooltip[sb_viewing_range_max;" .. fgettext("Maximal Viewing Range: $1 nodes", get_vrange_max) .. "]" - - if (get_vrange_min == nil and get_vrange_min > get_vrange_max) then - core.setting_set("viewing_range_nodes_min", get_vrange_max) - end - elseif (core.setting_getbool("viewing_range_auto") == nil or - core.setting_getbool("viewing_range_auto") == false) then + else tab_string = tab_string .. "box[3.75,3.5;3.75,1.5;#999999]" .. "label[3.85,3.5;" .. fgettext("Viewing Range :") .. "]" .. @@ -346,6 +341,9 @@ local function formspec(tabview, name, tabdata) "checkbox[3.85,4.3;cb_vrange_auto_adjust;" .. fgettext("Auto-adjust") .. ";" .. dump(core.setting_getbool("viewing_range_auto")) .. "]" end + if get_vrange_min > get_vrange_max then + core.setting_set("viewing_range_nodes_min", get_vrange_max) + end return tab_string end @@ -509,3 +507,4 @@ tab_settings = { cbf_formspec = formspec, cbf_button_handler = handle_settings_buttons } +