diff options
author | hap <happppp@users.noreply.github.com> | 2020-03-26 12:19:02 +0100 |
---|---|---|
committer | hap <happppp@users.noreply.github.com> | 2020-03-26 12:19:14 +0100 |
commit | 9f2a29e08ecb1b55eda092764934d0533b6b4ed9 (patch) | |
tree | c59d9496c0f8d9c64eea79c9b02e01c71d711f68 | |
parent | a8c0abadea40f6f65a4ac55583d678aa5be31993 (diff) |
about: remove auto pause (nw)
reason: inconsistent with other Tab menu entries including the fullscreen popup for selecting new machine, and also a bug where it refuses to unpause when closing About popup with Tab.
-rw-r--r-- | src/frontend/mame/ui/about.cpp | 19 | ||||
-rw-r--r-- | src/frontend/mame/ui/about.h | 5 | ||||
-rw-r--r-- | src/mame/drivers/conic_cchess2.cpp | 2 |
3 files changed, 4 insertions, 22 deletions
diff --git a/src/frontend/mame/ui/about.cpp b/src/frontend/mame/ui/about.cpp index dbe303f6b4f..089e5911c2d 100644 --- a/src/frontend/mame/ui/about.cpp +++ b/src/frontend/mame/ui/about.cpp @@ -27,7 +27,7 @@ namespace { ABOUT MODAL - **************************************************/ +**************************************************/ //------------------------------------------------- @@ -36,8 +36,6 @@ namespace { menu_about::menu_about(mame_ui_manager &mui, render_container &container) : menu(mui, container) - , m_pause_checked(false) - , m_was_paused(false) { } @@ -48,28 +46,15 @@ menu_about::menu_about(mame_ui_manager &mui, render_container &container) menu_about::~menu_about() { - // resume if appropriate (is the destructor really the right place - // to do this sort of activity?) - // TODO(mooglyguy): No, it isn't. We should have an explicit menu-exit callback. - if (!m_was_paused) - machine().resume(); } + //------------------------------------------------- // populate - populates the about modal //------------------------------------------------- void menu_about::populate(float &customtop, float &custombottom) { - // pause if appropriate - if (!m_pause_checked) - { - m_was_paused = machine().paused(); - if (!m_was_paused) - machine().pause(); - m_pause_checked = true; - } - for (char const *const *line = copying_text; *line; ++line) item_append(*line, "", 0, nullptr); diff --git a/src/frontend/mame/ui/about.h b/src/frontend/mame/ui/about.h index d9eef659c2d..2e68b7ed090 100644 --- a/src/frontend/mame/ui/about.h +++ b/src/frontend/mame/ui/about.h @@ -2,7 +2,7 @@ // copyright-holders:Ryan Holtz /*************************************************************************** - ui/barcode.h + ui/about.h "About" modal @@ -27,9 +27,6 @@ public: private: virtual void populate(float &customtop, float &custombottom) override; virtual void handle() override; - - bool m_pause_checked; - bool m_was_paused; }; } // namespace ui diff --git a/src/mame/drivers/conic_cchess2.cpp b/src/mame/drivers/conic_cchess2.cpp index d27ba8036b5..dcb90d16121 100644 --- a/src/mame/drivers/conic_cchess2.cpp +++ b/src/mame/drivers/conic_cchess2.cpp @@ -282,4 +282,4 @@ ROM_END ******************************************************************************/ // YEAR NAME PARENT CMP MACHINE INPUT STATE INIT COMPANY, FULLNAME, FLAGS -CONS( 1980, cncchess2, 0, 0, cncchess2, cncchess2, cchess2_state, empty_init, "Conic", "Computer Chess (Conic, model 7012)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) +CONS( 1980, cncchess2, 0, 0, cncchess2, cncchess2, cchess2_state, empty_init, "Conic", "Computer Chess (Conic, model 7012)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) |