From 10dd13d997a3961503fc5737d8c4f6c7b88ba9da Mon Sep 17 00:00:00 2001 From: Thomas Jentzsch Date: Wed, 17 Aug 2022 20:32:49 +0200 Subject: [PATCH] two small fixes --- src/emucore/DefProps.hxx | 2 +- src/emucore/stella.pro | 5 +++-- src/gui/RomImageWidget.cxx | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/emucore/DefProps.hxx b/src/emucore/DefProps.hxx index fac824d9f..b669dcf48 100644 --- a/src/emucore/DefProps.hxx +++ b/src/emucore/DefProps.hxx @@ -1979,7 +1979,7 @@ static constexpr BSPF::array2D DefProps = {{ { "87662815bc4f3c3c86071dc994e3f30e", "Intellivision Productions - M Network, Patricia Lewis Du Long, Stephen Tatsumi", "", "Swordfight (1983) (Intellivision)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "876a953daae0e946620cf05ed41989f4", "Retroactive", "", "Qb (V2.08) (PAL) (2001) (Retroactive)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, { "877a5397f3f205bf6750398c98f33de1", "Erik Eid", "", "Euchre (Beta) (PAL) (12-09-2002) (Erik Eid)", "", "New Release", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, - { "8786c1e56ef221d946c64f6b65b697e9", "20th Century Fox Video Games, David Lubar", "11015", "AKA Space Adventure", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, + { "8786c1e56ef221d946c64f6b65b697e9", "20th Century Fox Video Games - Sirius Software, David Lubar", "11015", "Flash Gordon (1983) (20th Century Fox Video Games - Sirius Software, David Lubar)", "AKA Space Adventure", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "8786f229b974c393222874f73a9f3206", "Activision, Larry Miller - Ariola", "EAX-021, EAX-021-04I - 711 021-720", "Spider Fighter (1983) (Activision) (PAL)", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, { "8786f4609a66fbea2cd9aa48ca7aa11c", "Goliath", "5", "Open Sesame (1983) (Goliath) (PAL)", "AKA Open, Sesame!", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "YES", "" }, { "87b460df21b7bbcfc57b1c082c6794b0", "Dennis Debro", "", "Climber 5 (20-03-2003) (Dennis Debro)", "", "Homebrew", "", "", "", "", "https://atariage.com/store/index.php?l=product_detail&p=261", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }, diff --git a/src/emucore/stella.pro b/src/emucore/stella.pro index cdf4f08ea..f40ee4a16 100644 --- a/src/emucore/stella.pro +++ b/src/emucore/stella.pro @@ -12385,9 +12385,10 @@ "" "Cart.MD5" "8786c1e56ef221d946c64f6b65b697e9" -"Cart.Manufacturer" "20th Century Fox Video Games, David Lubar" +"Cart.Manufacturer" "20th Century Fox Video Games - Sirius Software, David Lubar" "Cart.ModelNo" "11015" -"Cart.Name" "AKA Space Adventure" +"Cart.Name" "Flash Gordon (1983) (20th Century Fox Video Games - Sirius Software, David Lubar)" +"Cart.Note" "AKA Space Adventure" "" "Cart.MD5" "8786f229b974c393222874f73a9f3206" diff --git a/src/gui/RomImageWidget.cxx b/src/gui/RomImageWidget.cxx index 05edbfd5e..ff50cbe71 100644 --- a/src/gui/RomImageWidget.cxx +++ b/src/gui/RomImageWidget.cxx @@ -48,6 +48,13 @@ void RomImageWidget::setProperties(const FSNode& node, const Properties properti // Decide whether the information should be shown immediately if(instance().eventHandler().state() == EventHandlerState::LAUNCHER) parseProperties(node, full); + else + { +#ifdef DEBUGGER_SUPPORT + cerr << "RomImageWidget::setProperties: else!" << endl; + Logger::debug("RomImageWidget::setProperties: else!"); +#endif + } } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -60,6 +67,13 @@ void RomImageWidget::clearProperties() // Decide whether the information should be shown immediately if(instance().eventHandler().state() == EventHandlerState::LAUNCHER) setDirty(); + else + { +#ifdef DEBUGGER_SUPPORT + cerr << "RomImageWidget::clearProperties: else!" << endl; + Logger::debug("RomImageWidget::clearProperties: else!"); +#endif + } } // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -146,6 +160,8 @@ void RomImageWidget::parseProperties(const FSNode& node, bool full) // property *and* ROM name are found (TODO: fix that!) if(myImageList.size() && myImageList[0].getPath() != oldFileName) loadImage(myImageList[0].getPath()); + else + setDirty(); // update the counter display } #else mySurfaceIsValid = false; @@ -177,6 +193,8 @@ bool RomImageWidget::changeImage(int direction) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - bool RomImageWidget::getImageList(const string& propName, const string& romName) { + cerr << propName << " " << romName << endl; + const std::regex symbols{R"([-[\]{}()*+?.,\^$|#])"}; // \s const string rgxPropName = std::regex_replace(propName, symbols, R"(\$&)"); const string rgxRomName = std::regex_replace(romName, symbols, R"(\$&)");