fly/flightgear
1
0
Fork 0
Code Activity

Fix Nasal duplicate init

Browse source 
Also ensure Nasal reset is handled correctly (requires corresponding
SimGear commit)
This commit is contained in:
James Turner 2018-08-19 12:34:27 +01:00
parent 26bc3713b5
commit 09918a6862
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Main/fg_init.cxx
View file

@ -1005,9 +1005,7 @@ void fgPostInitSubsystems()
// Initialize the Nasal interpreter.
// Do this last, so that the loaded scripts see initialized state
////////////////////////////////////////////////////////////////////////
FGNasalSys* nasal = globals->add_new_subsystem<FGNasalSys>(SGSubsystemMgr::INIT);
nasal->init();
SG_LOG(SG_GENERAL, SG_INFO, "Nasal init took:" << st.elapsedMSec());
globals->add_new_subsystem<FGNasalSys>(SGSubsystemMgr::INIT);
// initialize methods that depend on other subsystems.
st.stamp();
@ -1102,11 +1100,8 @@ void fgStartNewReset()
fgSetBool("/sim/freeze/master", true);
SGSubsystemMgr* subsystemManger = globals->get_subsystem_mgr();
// Nasal is manually inited in fgPostInit, ensure it's already shutdown
// Nasal is added in fgPostInit, ensure it's already shutdown
// before other subsystems, so Nasal listeners don't fire during shutdown
SGSubsystem* nasal = subsystemManger->get_subsystem("nasal");
nasal->shutdown();
nasal->unbind();
subsystemManger->remove("nasal");
subsystemManger->shutdown();