diff --git a/src/ScreenReloadSongs.cpp b/src/ScreenReloadSongs.cpp index cfa926dfba..e5db726fdb 100644 --- a/src/ScreenReloadSongs.cpp +++ b/src/ScreenReloadSongs.cpp @@ -21,11 +21,11 @@ void ScreenReloadSongs::Init() loadWin=new InGameLoadingWindow( ); - loadWin->SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y ); - AddChild( loadWin ); - pLoadingWindow = new InGameLoadingWindow( ); + loadWin->SetXY( SCREEN_CENTER_X, SCREEN_CENTER_Y ); + + pLoadingWindow=loadWin; m_loadingThread.SetName("Song reload work thread"); m_loadingThread.Create(loadingThreadProc,this); @@ -33,18 +33,11 @@ void ScreenReloadSongs::Init() ScreenReloadSongs::~ScreenReloadSongs() { - delete pLoadingWindow; + //m_loadingThread.Halt(true); + RemoveChild(loadWin); + delete loadWin; } -void ScreenReloadSongs::Update( float fDeltaTime ) { - Screen::Update( fDeltaTime ); - - //SCREENMAN->Draw(); -} - - - - int ScreenReloadSongs::loadingThreadProc(void *thisAsVoidPtr) { ScreenReloadSongs *self=(ScreenReloadSongs *)thisAsVoidPtr; diff --git a/src/ScreenReloadSongs.h b/src/ScreenReloadSongs.h index 93ffa37d4f..5c3733aae3 100644 --- a/src/ScreenReloadSongs.h +++ b/src/ScreenReloadSongs.h @@ -11,7 +11,6 @@ class ScreenReloadSongs: public Screen public: virtual void Init(); ~ScreenReloadSongs(); - void Update( float fDeltaTime ); private: InGameLoadingWindow *loadWin; RageThread m_loadingThread;