Merge remote-tracking branch 'upstream/release0271'

Robbbert · Oct 30, 2024 · d580f0c · d580f0c
2 parents a521955 + 09877a4
commit d580f0c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/frontend/mame/ui/menu.cpp b/src/frontend/mame/ui/menu.cpp
@@ -1177,13 +1177,14 @@ std::pair<int, bool> menu::handle_pointer_update(uint32_t flags, ui_event const
 	// give derived class a chance to handle it
 	if ((track_pointer::IDLE == m_pointer_state) || (track_pointer::CUSTOM == m_pointer_state))
 	{
+		bool const wascustom(track_pointer::CUSTOM == m_pointer_state);
 		auto const [key, take, redraw] = custom_pointer_updated(changed, uievt);
 		if (take)
 		{
 			m_pointer_state = track_pointer::CUSTOM;
 			return std::make_pair(key, redraw);
 		}
-		else if (track_pointer::CUSTOM == m_pointer_state)
+		else if (wascustom)
 		{
 			if (uievt.pointer_buttons)
 			{

diff --git a/src/frontend/mame/ui/selmenu.cpp b/src/frontend/mame/ui/selmenu.cpp
@@ -1733,7 +1733,7 @@ bool menu_select_launch::handle_events(u32 flags, event &ev)
 
 		// text input goes to the search field unless there's an error message displayed
 		case ui_event::type::IME_CHAR:
-			if (!pointer_idle())
+			if (have_pointer() && !pointer_idle())
 				break;
 
 			if (exclusive_input_pressed(ev.iptkey, IPT_UI_FOCUS_NEXT, 0) || exclusive_input_pressed(ev.iptkey, IPT_UI_FOCUS_PREV, 0))