Jeck - Fix for issue 580. StyleManager initialization was causing an infinite loop. Also started documentation for OptionItem.

This commit is contained in:
wagic.jeck
2011-02-01 19:11:43 +00:00
parent ea285e673e
commit 8c18d155b8
4 changed files with 67 additions and 21 deletions
+4 -2
View File
@@ -490,8 +490,10 @@ GameSettings::GameSettings()
WStyle * GameSettings::getStyle()
{
if (!styleMan)
styleMan = new StyleManager();
if (!styleMan){
styleMan = new StyleManager();
styleMan->determineActive(NULL,NULL);
}
return styleMan->get();
}
+1
View File
@@ -548,6 +548,7 @@ void OptionTheme::confirmChange(bool confirmed)
{
setData();
options.getStyleMan()->loadRules();
options.getStyleMan()->determineActive(NULL, NULL);
if (ts)
ts->Reload();
-1
View File
@@ -104,7 +104,6 @@ void StyleManager::loadRules()
}
}
determineActive(NULL, NULL);
return;
}