From 258ae994915e1b9fc5b3a72627886f2ce4334902 Mon Sep 17 00:00:00 2001 From: ROllerozxa Date: Sat, 12 Feb 2022 20:24:20 +0100 Subject: [PATCH] Apply texture pack main menu textures immediately (#12018) --- builtin/mainmenu/tab_content.lua | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/builtin/mainmenu/tab_content.lua b/builtin/mainmenu/tab_content.lua index fb7f121f8..dd11570e9 100644 --- a/builtin/mainmenu/tab_content.lua +++ b/builtin/mainmenu/tab_content.lua @@ -154,6 +154,9 @@ local function handle_doubleclick(pkg) core.settings:set("texture_path", pkg.path) end packages = nil + + mm_game_theme.init() + mm_game_theme.reset() end end @@ -197,17 +200,17 @@ local function handle_buttons(tabview, fields, tabname, tabdata) return true end - if fields.btn_mod_mgr_use_txp then - local txp = packages:get_list()[tabdata.selected_pkg] - core.settings:set("texture_path", txp.path) - packages = nil - return true - end + if fields.btn_mod_mgr_use_txp or fields.btn_mod_mgr_disable_txp then + local txp_path = "" + if fields.btn_mod_mgr_use_txp then + txp_path = packages:get_list()[tabdata.selected_pkg].path + end - - if fields.btn_mod_mgr_disable_txp then - core.settings:set("texture_path", "") + core.settings:set("texture_path", txp_path) packages = nil + + mm_game_theme.init() + mm_game_theme.reset() return true end