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

Log warnings if the theme preference is not set to something valid. Moved underscore logic in IsThemeSelectable to IsThemeNameValid so that GetSelectableThemeNames doesn't fetch the directory list n^2 times.

Browse Source
This commit is contained in:
Kyzentun Keeslala
2016-06-20 13:56:53 -06:00
parent 7daaf04cfc
commit c3d37389ec
2 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ThemeManager.cpp
+36 -12
View File
@@ -192,10 +192,12 @@ void ThemeManager::GetSelectableThemeNames( vector<RString>& AddTo )
GetThemeNames( AddTo ); GetThemeNames( AddTo );
for( int i=AddTo.size()-1; i>=0; i-- ) for( int i=AddTo.size()-1; i>=0; i-- )
{ {
if( !IsThemeSelectable(AddTo[i]) ) if(!IsThemeNameValid(AddTo[i]))
{
AddTo.erase( AddTo.begin()+i ); AddTo.erase( AddTo.begin()+i );
} }
} }
}
int ThemeManager::GetNumSelectableThemes() int ThemeManager::GetNumSelectableThemes()
{ {
@@ -216,12 +218,14 @@ bool ThemeManager::DoesThemeExist( const RString &sThemeName )
return false; return false;
} }
bool ThemeManager::IsThemeSelectable( const RString &sThemeName ) bool ThemeManager::IsThemeSelectable(RString const& name)
{ {
if( !DoesThemeExist(sThemeName) ) return IsThemeNameValid(name) && DoesThemeExist(name);
return false; }
return sThemeName.Left(1) != "_"; bool ThemeManager::IsThemeNameValid(RString const& name)
{
return name.Left(1) != "_";
} }
RString ThemeManager::GetThemeDisplayName( const RString &sThemeName ) RString ThemeManager::GetThemeDisplayName( const RString &sThemeName )
@@ -383,18 +387,38 @@ void ThemeManager::SwitchThemeAndLanguage( const RString &sThemeName_, const RSt
// todo: if the theme isn't selectable, find the next theme that is, // todo: if the theme isn't selectable, find the next theme that is,
// and change to that instead of asserting/crashing since // and change to that instead of asserting/crashing since
// SpecialFiles::BASE_THEME_NAME is _fallback now. -aj // SpecialFiles::BASE_THEME_NAME is _fallback now. -aj
#if !defined(SMPACKAGE)
if(!IsThemeSelectable(sThemeName)) if(!IsThemeSelectable(sThemeName))
sThemeName = PREFSMAN->m_sTheme.GetDefault(); {
RString to_try= PREFSMAN->m_sTheme.GetDefault();
LOG->Warn("Selected theme '%s' not found. "
"Trying Theme preference default value '%s'.",
sThemeName.c_str(), to_try.c_str());
sThemeName = to_try;
// sm-ssc's SpecialFiles::BASE_THEME_NAME is _fallback, which you can't // sm-ssc's SpecialFiles::BASE_THEME_NAME is _fallback, which you can't
// select. This requires a preference, which allows it to be adapted for // select. This requires a preference, which allows it to be adapted for
// other purposes (e.g. PARASTAR). // other purposes (e.g. PARASTAR).
if(!IsThemeSelectable(sThemeName)) if(!IsThemeSelectable(sThemeName))
sThemeName = PREFSMAN->m_sDefaultTheme; {
#endif to_try= PREFSMAN->m_sDefaultTheme;
LOG->Warn("Theme preference defaults to '%s', which cannot be used."
ASSERT( IsThemeSelectable(sThemeName) ); " Trying DefaultTheme preference '%s'.",
sThemeName.c_str(), to_try.c_str());
sThemeName = to_try;
if(!IsThemeSelectable(sThemeName))
{
vector<RString> theme_names;
GetSelectableThemeNames(theme_names);
ASSERT_M(!theme_names.empty(), "No themes found, unable to start stepmania.");
to_try= theme_names[0];
LOG->Warn("DefaultTheme preference is '%s', which cannot be found."
" Using '%s'.",
sThemeName.c_str(), to_try.c_str());
sThemeName= to_try;
PREFSMAN->m_sDefaultTheme.Set(to_try);
}
}
PREFSMAN->m_sTheme.Set(sThemeName);
}
/* We haven't actually loaded the theme yet, so we can't check whether /* We haven't actually loaded the theme yet, so we can't check whether
* sLanguage exists. Just check for empty. */ * sLanguage exists. Just check for empty. */
src/ThemeManager.h
+2 -1
View File
@@ -36,7 +36,8 @@ public:
void GetSelectableThemeNames( vector<RString>& AddTo ); void GetSelectableThemeNames( vector<RString>& AddTo );
int GetNumSelectableThemes(); int GetNumSelectableThemes();
bool DoesThemeExist( const RString &sThemeName ); bool DoesThemeExist( const RString &sThemeName );
bool IsThemeSelectable( const RString &sThemeName ); bool IsThemeSelectable(RString const& name);
bool IsThemeNameValid(RString const& name);
RString GetThemeDisplayName( const RString &sThemeName ); RString GetThemeDisplayName( const RString &sThemeName );
RString GetThemeAuthor( const RString &sThemeName ); RString GetThemeAuthor( const RString &sThemeName );
void GetLanguages( vector<RString>& AddTo ); void GetLanguages( vector<RString>& AddTo );