if there aren't any songs just execute the original gd code

RayDeeUx · Jul 9, 2024 · 3825daa · 3825daa
1 parent 3b1106b
commit 3825daa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/SongManager.cpp b/src/SongManager.cpp
@@ -1,5 +1,6 @@
 #include "SongManager.hpp"
 #include "Utils.hpp"
+#include <Geode/binding/GameManager.hpp>
 
 SongManager::SongManager() {}
 
@@ -17,7 +18,7 @@ void SongManager::pickRandomSong() {
 	if (m_songs.size() >= 1) {
 		m_currentSong = m_songs[Utils::randomIndex(m_songs.size())];
 	} else {
-		m_currentSong = "";
+		m_currentSong = GameManager::get()->getMenuMusicFile();
 	}
 }
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -15,9 +15,6 @@ SongManager &songManager = SongManager::get();
 
 struct GameManagerHook : Modify<GameManagerHook, GameManager> {
 	gd::string getMenuMusicFile() {
-		if (songManager.getCurrentSong().empty())
-			return GameManager::getMenuMusicFile();
-
 		return songManager.getCurrentSong();
 	}
 };