From aafa2e1009997864efef7c74e6a22c3eb966f7e7 Mon Sep 17 00:00:00 2001 From: Pieter Hulshoff Date: Wed, 6 Dec 2017 11:40:10 +0100 Subject: [PATCH] Fixed support for default.png in the common mode for reloadable media. --- RetroFE/Source/Graphics/Component/ReloadableMedia.cpp | 7 ++++++- RetroFE/Source/Version.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp b/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp index c134bfd..93b6168 100644 --- a/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp +++ b/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp @@ -211,7 +211,12 @@ void ReloadableMedia::reloadTexture() std::string typeLC = Utils::toLower(type_); bool defined = false; - if(typeLC == "numberbuttons") + if(basename == "default") + { + basename = "default"; + defined = true; + } + else if(typeLC == "numberbuttons") { basename = selectedItem->numberButtons; defined = true; diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp index ac97f45..e013370 100644 --- a/RetroFE/Source/Version.cpp +++ b/RetroFE/Source/Version.cpp @@ -21,7 +21,7 @@ std::string retrofe_version_major = "0"; std::string retrofe_version_minor = "8"; -std::string retrofe_version_build = "14b1"; +std::string retrofe_version_build = "14"; std::string Version::getString( )