removed printf and corrected fallback img that was not used correctly…

… if user theme
FunKey-Project · Jun 24, 2021 · 9bdb23d · 9bdb23d
1 parent ee5489b
commit 9bdb23d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp b/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp
@@ -414,12 +414,13 @@ void ReloadableMedia::reloadTexture( bool previousItem )
         }
     }
 
-    // if image and artwork was not specified, image fall back
+    // if image and artwork was not specified, image fallback
     if(!loadedComponent_ && imageFallback_)
     {
         std::string imagePath;
         ImageBuilder imageBuild;
-        imagePath = Utils::combinePath(Configuration::isUserLayout_?Configuration::userPath:Configuration::absolutePath, "collections", collectionName );
+        //imagePath = Utils::combinePath(Configuration::isUserLayout_?Configuration::userPath:Configuration::absolutePath, "collections", collectionName );
+        imagePath = Utils::combinePath(Configuration::absolutePath, "collections", collectionName ); // forcing absolutePath and folder "Collection" for backups
         imagePath = Utils::combinePath( imagePath, "system_artwork" );
         loadedComponent_ = imageBuild.CreateImage( imagePath, page, std::string("fallback"), scaleX_, scaleY_, ditheringAuthorized_ );
     }

diff --git a/RetroFE/Source/Graphics/Component/ScrollingList.cpp b/RetroFE/Source/Graphics/Component/ScrollingList.cpp
@@ -726,7 +726,8 @@ bool ScrollingList::allocateTexture( unsigned int index, Item *item )
 
     // Image fallback
     if ( !t && imageType_.compare(std::string("null"))){
-        imagePath = Utils::combinePath(Configuration::isUserLayout_?Configuration::userPath:Configuration::absolutePath, "collections", collectionName );
+        //imagePath = Utils::combinePath(Configuration::isUserLayout_?Configuration::userPath:Configuration::absolutePath, "collections", collectionName );
+        imagePath = Utils::combinePath(Configuration::absolutePath, "collections", collectionName ); // forcing absolutePath and folder "Collection" for backups
         imagePath = Utils::combinePath( imagePath, "system_artwork" );
         t = imageBuild.CreateImage( imagePath, page, std::string("fallback"), scaleX_, scaleY_, ditheringAuthorized_ );
     }

diff --git a/RetroFE/Source/Graphics/PageBuilder.cpp b/RetroFE/Source/Graphics/PageBuilder.cpp
@@ -100,8 +100,6 @@ Page *PageBuilder::buildPage( std::string collectionName )
     }
     layoutFile = Utils::combinePath(layoutPath, layoutPage + ".xml");
 
-    printf("In %s, layoutFile is %s \n", __func__, layoutFile.c_str());
-
     if ( screenWidth_*3/4 == screenHeight_ )
         layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + " 4x3.xml");
     else if ( screenWidth_*4/3 == screenHeight_ )