Jeck - Fix for issue 580. StyleManager initialization was causing an infinite loop. Also started documentation for OptionItem.
This commit is contained in:
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -548,6 +548,7 @@ void OptionTheme::confirmChange(bool confirmed)
|
||||
{
|
||||
setData();
|
||||
options.getStyleMan()->loadRules();
|
||||
options.getStyleMan()->determineActive(NULL, NULL);
|
||||
if (ts)
|
||||
ts->Reload();
|
||||
|
||||
|
||||
@@ -104,7 +104,6 @@ void StyleManager::loadRules()
|
||||
}
|
||||
}
|
||||
|
||||
determineActive(NULL, NULL);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user