luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-13 08:35:20 +02:00
Code Activity

Mainmenu: Fix error after ESC in dialog windows (#16130)

Browse Source 
The error was caused by fd857374, where 'MenuQuit' was processed after 'try_quit'.
This commit fixes the error by moving the special 'MenuQuit' handling to Lua.
This commit is contained in:
SmallJoker
2025-05-18 20:41:42 +02:00
committed by GitHub
parent 554dd5ddf4
commit 56ecf6d332
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/fstk/ui.lua
View File

@@ -166,6 +166,10 @@ end
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
core.button_handler = function(fields) core.button_handler = function(fields)
if fields["try_quit"] and not fields["key_enter"] then
core.event_handler("MenuQuit")
return
end
if fields["btn_reconnect_yes"] then if fields["btn_reconnect_yes"] then
gamedata.reconnect_requested = false gamedata.reconnect_requested = false
gamedata.errormessage = nil gamedata.errormessage = nil

1
src/gui/guiFormSpecMenu.cpp
View File

@@ -4053,7 +4053,6 @@ void GUIFormSpecMenu::tryClose()
quitMenu(); quitMenu();
} else { } else {
acceptInput(quit_mode_try); acceptInput(quit_mode_try);
m_text_dst->gotText(L"MenuQuit");
} }
} }