Reorder delegate operations

Drewol · Apr 27, 2021 · b9c6488 · b9c6488
1 parent 3a4c72c
commit b9c6488
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/Main/src/Track.cpp b/Main/src/Track.cpp
@@ -24,12 +24,9 @@ Track::Track()
 
 Track::~Track()
 {
-	if (loader)
-	{
-		delete loader;
-		g_input.OnButtonReleased.Remove(this, &Track::OnButtonReleased);
-	}
+	g_input.OnButtonReleased.Remove(this, &Track::OnButtonReleased);
 
+	delete loader;
 	for (auto & i : m_laserTrackBuilder)
 		delete i;
 	for (auto & m_hitEffect : m_hitEffects)
@@ -39,6 +36,8 @@ Track::~Track()
 
 bool Track::AsyncLoad()
 {
+	g_input.OnButtonReleased.Add(this, &Track::OnButtonReleased);
+
 	loader = new AsyncAssetLoader();
 	String skin = g_application->GetCurrentSkin();
 
@@ -228,8 +227,6 @@ bool Track::AsyncFinalize()
 	timedHitEffect->time = 0;
 	timedHitEffect->track = this;
 
-	g_input.OnButtonReleased.Add(this, &Track::OnButtonReleased);
-
 	bool delayedHitEffects = g_gameConfig.GetBool(GameConfigKeys::DelayedHitEffects);
 
 	for (int i = 0; i < 6; ++i)