prevent reloading wheel after diff reload if exiting anyways

this stops a crash in rebirth
etternagame · Feb 28, 2023 · 40f0550 · 40f0550
1 parent 71991a7
commit 40f0550
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Themes/Rebirth/Scripts/11 Wheel.lua b/Themes/Rebirth/Scripts/11 Wheel.lua
@@ -1251,6 +1251,9 @@ function MusicWheel:new(params)
     end
 
     w.ReloadFilteredSongsCommand = function(self, params)
+        -- this stops things like the diff reload from killing the game
+        if enteringSong then return end
+
         local newItems = WHEELDATA:GetFilteredFolders()
         WHEELDATA:SetWheelItems(newItems)
 

diff --git a/src/Etterna/Screen/Others/ScreenSelectMusic.cpp b/src/Etterna/Screen/Others/ScreenSelectMusic.cpp
@@ -387,7 +387,11 @@ void
 ScreenSelectMusic::DifferentialReload()
 {
 	// reload songs
-	SONGMAN->DifferentialReload();
+	SONGMAN->DifferentialReload();
+
+	if (IsTransitioning() || m_SelectionState == SelectionState_Finalized) {
+		return;
+	}
 
 	const auto selSong = GAMESTATE->m_pCurSong;
 	const auto currentHoveredGroup = m_MusicWheel.GetCurrentGroup();