diff options
| author | 2024-07-31 03:06:20 +1000 | |
|---|---|---|
| committer | 2024-07-31 03:06:20 +1000 | |
| commit | d32f7e3a99a0dd508ecdcfe4495451cfc5458ed2 (patch) | |
| tree | 6bfc142dc35bf185edd8139eff935760816fb26e /src/frontend | |
| parent | b0e8291bb6801025a6e9d3819aee829e60de45c7 (diff) | |
-debugger/qt: Fixed crash on hard reset.
-ui/selmenu.cpp: Dismiss error messages on pressing left or right.
Diffstat (limited to 'src/frontend')
| -rw-r--r-- | src/frontend/mame/ui/selmenu.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/frontend/mame/ui/selmenu.cpp b/src/frontend/mame/ui/selmenu.cpp index ee823f12d8e..db16681e247 100644 --- a/src/frontend/mame/ui/selmenu.cpp +++ b/src/frontend/mame/ui/selmenu.cpp @@ -1918,7 +1918,11 @@ bool menu_select_launch::handle_keys(u32 flags, int &iptkey) if (exclusive_input_pressed(iptkey, IPT_UI_CANCEL, 0)) { - if (!m_search.empty()) + if (m_ui_error) + { + // dismiss error + } + else if (!m_search.empty()) { // escape pressed with non-empty search text clears it m_search.clear(); @@ -1940,7 +1944,12 @@ bool menu_select_launch::handle_keys(u32 flags, int &iptkey) // accept left/right keys as-is with repeat if (exclusive_input_pressed(iptkey, IPT_UI_LEFT, (flags & PROCESS_LR_REPEAT) ? 6 : 0)) { - if (m_focus == focused_menu::RIGHTTOP) + if (m_ui_error) + { + // dismiss error + return false; + } + else if (m_focus == focused_menu::RIGHTTOP) { // Swap the right panel and swallow it iptkey = IPT_INVALID; @@ -1971,7 +1980,12 @@ bool menu_select_launch::handle_keys(u32 flags, int &iptkey) // swallow left/right keys if they are not appropriate if (exclusive_input_pressed(iptkey, IPT_UI_RIGHT, (flags & PROCESS_LR_REPEAT) ? 6 : 0)) { - if (m_focus == focused_menu::RIGHTTOP) + if (m_ui_error) + { + // dismiss error + return false; + } + else if (m_focus == focused_menu::RIGHTTOP) { // Swap the right panel and swallow it iptkey = IPT_INVALID; |
