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

War on -Werror, part 14: More hodgepodge.

Browse Source
This commit is contained in:
Jason Felds
2012-12-27 12:45:04 -05:00
parent 52df8ea981
commit a15cbc431d
36 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ThemeManager.cpp
+2 -2
View File
@@ -872,7 +872,7 @@ void ThemeManager::ReloadMetrics()
RString ThemeManager::GetMetricsGroupFallback( const RString &sMetricsGroup )
{
ASSERT( g_pLoadedThemeData );
ASSERT( g_pLoadedThemeData != NULL );
// always look in iniMetrics for "Fallback"
RString sFallback;
@@ -1166,7 +1166,7 @@ RString ThemeManager::GetString( const RString &sMetricsGroup, const RString &sV
sValueName.Replace( "\r\n", "\\n" );
sValueName.Replace( "\n", "\\n" );
ASSERT( g_pLoadedThemeData );
ASSERT( g_pLoadedThemeData != NULL );
RString s = GetMetricRaw( g_pLoadedThemeData->iniStrings, sMetricsGroup, sValueName );
FontCharAliases::ReplaceMarkers( s );