diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 495e63f443550..4801bc308cad5 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/docs/source/conf.py b/docs/source/conf.py index 87fbe33ec0d8e..ff6181e63fab6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -63,9 +63,9 @@ # built documents. # # The short X.Y version. -version = '0.270' +version = '0.271' # The full version, including alpha/beta/rc tags. -release = '0.270' +release = '0.271' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/hash/nes.xml b/hash/nes.xml index c04dc5f3066e9..fecd91c766ba6 100644 --- a/hash/nes.xml +++ b/hash/nes.xml @@ -8499,26 +8499,17 @@ license:CC0-1.0 - NESert Golfing Tournament Edition (v1.4) 2019 rainwarrior - - + - + diff --git a/makefile b/makefile index ddf809310a0bf..6039e9e7e9df0 100644 --- a/makefile +++ b/makefile @@ -1578,7 +1578,7 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.270"' > $@ + @echo '#define BARE_BUILD_VERSION "0.271"' > $@ @echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_vcs_revision[];' >> $@ @@ -1588,7 +1588,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) @echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.270" > $@ + @echo #define BARE_BUILD_VERSION "0.271" > $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@ diff --git a/src/frontend/mame/ui/menu.cpp b/src/frontend/mame/ui/menu.cpp index 740a310e2f50d..76f77261ea0b8 100644 --- a/src/frontend/mame/ui/menu.cpp +++ b/src/frontend/mame/ui/menu.cpp @@ -1177,13 +1177,14 @@ std::pair 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 index 1c1933721db69..e06103db3d070 100644 --- 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))