From 19417ac2f9f0aca71ada33464b8ab01afda931e8 Mon Sep 17 00:00:00 2001
From: Pieter Hulshoff <pieter@towel42.nl>
Date: Sat, 20 Apr 2019 19:08:21 +0200
Subject: [PATCH] Replaced autoFavorites with firstPlaylist parameter. Also
 items in attractModeSkipPlaylist are no longer saved in the lastplayed
 playlist to prevent settings from appearing in there.

---
 RetroFE/Source/RetroFE.cpp | 32 ++++++++++++--------------------
 RetroFE/Source/Version.cpp |  2 +-
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index 3a243d3..f4bfe1c 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -433,17 +433,9 @@ void RetroFE::run( )
 
                     currentPage_->pushCollection(info);
 
-                    bool autoFavorites = true;
-                    config_.getProperty( "autoFavorites", autoFavorites );
-
-                    if (autoFavorites)
-                    {
-                        currentPage_->selectPlaylist("favorites"); // Switch to favorites playlist
-                    }
-                    else
-                    {
-                        currentPage_->selectPlaylist("all"); // Switch to all games playlist
-                    }
+                    std::string firstPlaylist = "all";
+                    config_.getProperty( "firstPlaylist", firstPlaylist );
+                    currentPage_->selectPlaylist( firstPlaylist );
 
                     currentPage_->onNewItemSelected( );
                     currentPage_->reallocateMenuSpritePoints( );
@@ -611,20 +603,17 @@ void RetroFE::run( )
 
                 bool rememberMenu = false;
                 config_.getProperty( "rememberMenu", rememberMenu );
-                bool autoFavorites = true;
-                config_.getProperty( "autoFavorites", autoFavorites );
+
+                std::string firstPlaylist = "all";
+                config_.getProperty( "firstPlaylist", firstPlaylist );
 
                 if (rememberMenu && lastMenuPlaylists_.find( nextPageName ) != lastMenuPlaylists_.end( ))
                 {
-                  currentPage_->selectPlaylist( lastMenuPlaylists_[nextPageName] ); // Switch to last playlist
-                }
-                else if (autoFavorites)
-                {
-                  currentPage_->selectPlaylist( "favorites" ); // Switch to favorites playlist
+                    currentPage_->selectPlaylist( lastMenuPlaylists_[nextPageName] ); // Switch to last playlist
                 }
                 else
                 {
-                  currentPage_->selectPlaylist( "all" ); // Switch to all games playlist
+                    currentPage_->selectPlaylist( firstPlaylist );
                 }
 
                 if ( rememberMenu && lastMenuOffsets_.find( nextPageName ) != lastMenuOffsets_.end( ) )
@@ -702,7 +691,10 @@ void RetroFE::run( )
                 nextPageItem_ = currentPage_->getSelectedItem( );
                 launchEnter( );
                 CollectionInfoBuilder cib(config_, *metadb_);
-                cib.updateLastPlayedPlaylist( currentPage_->getCollection(), nextPageItem_ );
+                std::string attractModeSkipPlaylist = "";
+                config_.getProperty( "attractModeSkipPlaylist", attractModeSkipPlaylist );
+                if (currentPage_->getPlaylistName( ) != attractModeSkipPlaylist)
+                    cib.updateLastPlayedPlaylist( currentPage_->getCollection(), nextPageItem_ ); // Update last played playlist if not currently in the skip playlist (e.g. settings)
                 l.run(nextPageItem_->collectionInfo->name, nextPageItem_);
                 launchExit( );
                 currentPage_->exitGame( );
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index d3e612e..002e926 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 = "32";
+std::string retrofe_version_build = "33";
 
 
 std::string Version::getString( )