fix stale statics
comments
This commit is contained in:
@@ -244,9 +244,11 @@ ScreenManager::~ScreenManager()
|
|||||||
if( g_ScreenStack[i].m_bDeleteWhenDone )
|
if( g_ScreenStack[i].m_bDeleteWhenDone )
|
||||||
SAFE_DELETE( g_ScreenStack[i].m_pScreen );
|
SAFE_DELETE( g_ScreenStack[i].m_pScreen );
|
||||||
}
|
}
|
||||||
|
g_ScreenStack.clear();
|
||||||
DeletePreparedScreens();
|
DeletePreparedScreens();
|
||||||
for( unsigned i=0; i<g_OverlayScreens.size(); i++ )
|
for( unsigned i=0; i<g_OverlayScreens.size(); i++ )
|
||||||
SAFE_DELETE( g_OverlayScreens[i] );
|
SAFE_DELETE( g_OverlayScreens[i] );
|
||||||
|
g_OverlayScreens.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This is called when we start up, and when the theme changes or is reloaded. */
|
/* This is called when we start up, and when the theme changes or is reloaded. */
|
||||||
@@ -261,11 +263,12 @@ void ScreenManager::ThemeChanged()
|
|||||||
m_soundInvalid.Load( THEME->GetPathS("Common","invalid") );
|
m_soundInvalid.Load( THEME->GetPathS("Common","invalid") );
|
||||||
m_soundScreenshot.Load( THEME->GetPathS("Common","screenshot") );
|
m_soundScreenshot.Load( THEME->GetPathS("Common","screenshot") );
|
||||||
|
|
||||||
// reload overlay screens
|
// unload overlay screens
|
||||||
for( unsigned i=0; i<g_OverlayScreens.size(); i++ )
|
for( unsigned i=0; i<g_OverlayScreens.size(); i++ )
|
||||||
SAFE_DELETE( g_OverlayScreens[i] );
|
SAFE_DELETE( g_OverlayScreens[i] );
|
||||||
g_OverlayScreens.clear();
|
g_OverlayScreens.clear();
|
||||||
|
|
||||||
|
// reload overlay screens
|
||||||
RString sOverlays = THEME->GetMetric( "Common","OverlayScreens" );
|
RString sOverlays = THEME->GetMetric( "Common","OverlayScreens" );
|
||||||
vector<RString> asOverlays;
|
vector<RString> asOverlays;
|
||||||
split( sOverlays, ",", asOverlays );
|
split( sOverlays, ",", asOverlays );
|
||||||
|
|||||||
Reference in New Issue
Block a user