Changed NoteSkinManager to use new error reporting and avoid crashing. Fixed DoChangeTheme to switch to the InitialScreen if the screen doesn't exist in the theme being changed to. Fixed error reporting in MeterDisplay.

This commit is contained in:
Kyzentun
2014-07-15 13:28:06 -06:00
committed by Jonathan Payne
parent 8a6f6a7124
commit a9056c20d1
6 changed files with 76 additions and 30 deletions
+5
View File
@@ -722,6 +722,11 @@ void ScreenManager::LoadDelayedScreen()
{
RString sScreenName = m_sDelayedScreen;
m_sDelayedScreen = "";
if(!IsScreenNameValid(sScreenName))
{
LuaHelpers::ReportScriptError("Tried to go to invalid screen: " + sScreenName, "INVALID_SCREEN");
return;
}
// Pop the top screen, if any.
ScreenMessage SM = PopTopScreenInternal();