actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

don't read the metric before ThemeManager is loaded

Browse Source
This commit is contained in:
Chris Danford
2005-02-06 19:42:46 +00:00
parent a5e1ea15a4
commit ce82f9c5c6
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeManager.h
+1
View File
@@ -30,6 +30,7 @@ public:
void SwitchThemeAndLanguage( const CString &sThemeName, const CString &sLanguage ); void SwitchThemeAndLanguage( const CString &sThemeName, const CString &sLanguage );
void UpdateLuaGlobals(); void UpdateLuaGlobals();
CString GetCurThemeName() { return m_sCurThemeName; }; CString GetCurThemeName() { return m_sCurThemeName; };
bool IsThemeLoaded() { return !m_sCurThemeName.empty(); };
CString GetCurLanguage() { return m_sCurLanguage; }; CString GetCurLanguage() { return m_sCurLanguage; };
CString GetCurThemeDir() { return GetThemeDirFromName(m_sCurThemeName); }; CString GetCurThemeDir() { return GetThemeDirFromName(m_sCurThemeName); };
void NextTheme(); void NextTheme();
stepmania/src/ThemeMetric.h
+1 -1
View File
@@ -62,7 +62,7 @@ public:
void Read() void Read()
{ {
if( m_sName != "" ) if( m_sName != "" && THEME && THEME->IsThemeLoaded() )
THEME->GetMetric( m_sGroup, m_sName, m_currentValue ); THEME->GetMetric( m_sGroup, m_sName, m_currentValue );
} }