Fix assertion failing when exiting while a chart is loading

Drewol · Apr 27, 2021 · 1452c99 · 1452c99
1 parent b72ae68
commit 1452c99
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Main/src/Game.cpp b/Main/src/Game.cpp
@@ -209,8 +209,6 @@ class Game_Impl : public Game
 
  ~Game_Impl()
  {
- if (m_track)
- g_input.OnButtonReleased.Remove(m_track, &Track::OnButtonReleased);
  delete m_track;
  delete m_background;
  delete m_foreground;

diff --git a/Main/src/Track.cpp b/Main/src/Track.cpp
@@ -24,7 +24,11 @@ Track::Track()
 
 Track::~Track()
 {
- delete loader;
+ if (loader)
+ {
+ delete loader;
+ g_input.OnButtonReleased.Remove(this, &Track::OnButtonReleased);
+ }
 
  for (auto & i : m_laserTrackBuilder)
  delete i;