folders are not songs

Author: solamint

Encore/src/menus/SettingsMenu.cpp

@@ -30,7 +30,8 @@ void SettingsMenu::Draw() {
     SongTime &enctime = TheSongTime;
     settingsOptionRenderer sor;
     encOS::DrawTopOvershell(0.15f);
-    GameMenu::DrawAlbumArtBackground(TheSongList.curSong->albumArtBlur);
+    if (TheSongList.curSong != nullptr)
+        GameMenu::DrawAlbumArtBackground(TheSongList.curSong->albumArtBlur);
     DrawRectangle(0, 0, GetScreenWidth(), GetScreenHeight(), Color{50, 0, 0, 200});
 
     float TextPlacementTB = u.hpct(0.05f);

Encore/src/menus/cacheLoadingScreen.cpp

@@ -43,8 +43,7 @@ bool finished = false;
 bool started = false;
 
 void LoadCache() {
-    SongList &list = TheSongList;
-    list.LoadCache(TheGameSettings.SongPaths);
+    TheSongList.LoadCache(TheGameSettings.SongPaths);
     finished = true;
 }
 

Encore/src/menus/gameMenu.cpp

@@ -392,7 +392,7 @@ void MainMenu::MainMenuScreen() {
             { u.wpct(0.02f), u.hpct(0.3f), u.winpct(0.2f), u.hinpct(0.08f) },
             "Invalid song cache!"
         );
-        TheSongList.ScanSongs(TheGameSettings.SongPaths);
+        // TheSongList.ScanSongs(TheGameSettings.SongPaths);
         songsLoaded = false;
         DrawRectanglePro(
             { ((float)GetScreenWidth() / 2) - 125,

Encore/src/song/songlist.cpp

@@ -181,9 +181,10 @@ void SongList::ScanFolder(const std::filesystem::path &folder) {
     }
 
     directoryCount++;
-    Song song;
+
     std::filesystem::path infoPath = folder / "info.json";
     if (std::filesystem::exists(infoPath)) {
+        Song song;
         song.songInfoPath = (folder / "info.json");
         song.songDir = folder.string();
         for (auto &file : std::filesystem::directory_iterator(folder)) {
@@ -193,19 +194,22 @@ void SongList::ScanFolder(const std::filesystem::path &folder) {
             }
         }
         song.LoadSongJSON(song.songInfoPath);
+        songs.push_back(std::move(song));
     } else if (std::filesystem::exists(folder / "song.ini")) {
+        Song song;
         song.songInfoPath = (folder / "song.ini").string();
         song.songDir = folder.string();
         song.LoadSongIni(folder);
         song.ini = true;
+        songs.push_back(std::move(song));
     } else {
         // If this folder doesn't have song.ini or song.json, this must be a organizational folder; continue scanning.
         for (const auto &entry : std::filesystem::directory_iterator(folder)) {
             ScanFolder(entry.path());
         };
     }
 
-    songs.push_back(std::move(song));
+
     songCount++;
 }