fly/flightgear
1
0
Fork 0
Code Activity

Reset: do general init on reset path

Browse source
This commit is contained in:
James Turner 2013-11-22 22:42:04 +00:00
parent 0fbc448af0
commit af6095c5d1
2 changed files with 4 additions and 3 deletions

4
src/Main/fg_init.cxx
View file

@ -984,6 +984,9 @@ void fgStartNewReset()
globals->resetPropertyRoot(); globals->resetPropertyRoot();
globals->restoreInitialState(); globals->restoreInitialState();
fgInitConfig(0, NULL, true);
fgInitGeneral(); // all of this?
render = new FGRenderer; render = new FGRenderer;
render->setEventHandler(eventHandler); render->setEventHandler(eventHandler);
globals->set_renderer(render); globals->set_renderer(render);
@ -995,7 +998,6 @@ void fgStartNewReset()
flightgear::CameraGroup::buildDefaultGroup(viewer.get()); flightgear::CameraGroup::buildDefaultGroup(viewer.get());
fgOSResetProperties(); fgOSResetProperties();
fgInitConfig(0, NULL, true);
// init some things manually // init some things manually
// which do not follow the regular init pattern // which do not follow the regular init pattern

3
src/Main/globals.cxx
View file

@ -520,10 +520,9 @@ FGGlobals::resetPropertyRoot()
{ {
delete locale; delete locale;
#if DEBUG_RESET
SG_LOG(SG_GENERAL, SG_INFO, "root props refcount:" << props.getNumRefs()); SG_LOG(SG_GENERAL, SG_INFO, "root props refcount:" << props.getNumRefs());
treeDumpRefCounts(0, props); treeDumpRefCounts(0, props);
#endif
props = new SGPropertyNode; props = new SGPropertyNode;
initProperties(); initProperties();
locale = new FGLocale(props); locale = new FGLocale(props);