From 1cdab04b96bbba08e50d4b8d74760aa5d72c5a82 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 28 Sep 2006 03:41:56 +0000 Subject: [PATCH] fix weird singleton init --- stepmania/src/StepMania.cpp | 3 +++ stepmania/src/WorkoutManager.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index d657e51f5f..25684ca7e6 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -43,6 +43,7 @@ #include "NoteSkinManager.h" #include "PrefsManager.h" #include "SongManager.h" +#include "WorkoutManager.h" #include "CharacterManager.h" #include "GameState.h" #include "AnnouncerManager.h" @@ -258,6 +259,7 @@ void ShutdownGame() SAFE_DELETE( UNLOCKMAN ); SAFE_DELETE( CRYPTMAN ); SAFE_DELETE( MEMCARDMAN ); + SAFE_DELETE( WORKOUTMAN ); SAFE_DELETE( SONGMAN ); SAFE_DELETE( BANNERCACHE ); SAFE_DELETE( SONGINDEX ); @@ -1051,6 +1053,7 @@ int main(int argc, char* argv[]) /* depends on SONGINDEX: */ SONGMAN = new SongManager(); + WORKOUTMAN = new WorkoutManager; if( !GetCommandlineArgument("ExportNsisStrings") && !GetCommandlineArgument("ExportLuaInformation") ) SONGMAN->InitAll( pLoadingWindow ); // this takes a long time CRYPTMAN = new CryptManager; // need to do this before ProfileMan diff --git a/stepmania/src/WorkoutManager.cpp b/stepmania/src/WorkoutManager.cpp index 3c4d4b5e17..2bb2e64206 100644 --- a/stepmania/src/WorkoutManager.cpp +++ b/stepmania/src/WorkoutManager.cpp @@ -11,7 +11,7 @@ static const RString WORKOUTS_SUBDIR = "Workouts/"; -WorkoutManager* WORKOUTMAN = new WorkoutManager; // global and accessable from anywhere in our program +WorkoutManager* WORKOUTMAN = NULL; // global and accessable from anywhere in our program WorkoutManager::WorkoutManager() {