diff --git a/stepmania/src/ThemeManager.h b/stepmania/src/ThemeManager.h index 22db22700f..799059e8f7 100644 --- a/stepmania/src/ThemeManager.h +++ b/stepmania/src/ThemeManager.h @@ -30,6 +30,7 @@ public: void SwitchThemeAndLanguage( const CString &sThemeName, const CString &sLanguage ); void UpdateLuaGlobals(); CString GetCurThemeName() { return m_sCurThemeName; }; + bool IsThemeLoaded() { return !m_sCurThemeName.empty(); }; CString GetCurLanguage() { return m_sCurLanguage; }; CString GetCurThemeDir() { return GetThemeDirFromName(m_sCurThemeName); }; void NextTheme(); diff --git a/stepmania/src/ThemeMetric.h b/stepmania/src/ThemeMetric.h index 016de434e0..ce8db7ffe2 100644 --- a/stepmania/src/ThemeMetric.h +++ b/stepmania/src/ThemeMetric.h @@ -62,7 +62,7 @@ public: void Read() { - if( m_sName != "" ) + if( m_sName != "" && THEME && THEME->IsThemeLoaded() ) THEME->GetMetric( m_sGroup, m_sName, m_currentValue ); }