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.

2014-07-15 13:28:06 -06:00
parent 273b76d3c7
commit 0f72d7cc6b
6 changed files with 76 additions and 30 deletions
@@ -145,6 +145,13 @@ namespace

 		StepMania::ResetGame();
 		SCREENMAN->ThemeChanged();
+		// Not all themes use the same screen names!  Check whether the new
+		// screen is valid in the new theme before setting it.  Use the
+		// InitialScreen metric if it's not.
+		if(!SCREENMAN->IsScreenNameValid(g_sNewScreen))
+		{
+			g_sNewScreen= THEME->GetMetric("Common", "InitialScreen");
+		}
 		SCREENMAN->SetNewScreen( g_sNewScreen );

 		g_sNewTheme = RString();