fly/flightgear
1
0
Fork 0
Code Activity

Fix crash on reset if terrasync is disabled

Browse source 
Also use C++11 iteration for group names in reset start code.
This commit is contained in:
James Turner 2017-12-04 21:41:05 +00:00
parent 8e6500ae47
commit 78950fea57
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Main/fg_init.cxx
View file

@ -1081,21 +1081,19 @@ void fgStartNewReset()
// remove most subsystems, with a few exceptions. // remove most subsystems, with a few exceptions.
for (int g=0; g<SGSubsystemMgr::MAX_GROUPS; ++g) { for (int g=0; g<SGSubsystemMgr::MAX_GROUPS; ++g) {
SGSubsystemGroup* grp = subsystemManger->get_group(static_cast<SGSubsystemMgr::GroupType>(g)); SGSubsystemGroup* grp = subsystemManger->get_group(static_cast<SGSubsystemMgr::GroupType>(g));
const string_list& names(grp->member_names()); for (auto nm : grp->member_names()) {
string_list::const_iterator it; if ((nm == "time") || (nm == "terrasync") || (nm == "events")
for (it = names.begin(); it != names.end(); ++it) { || (nm == "lighting") || (nm == FGScenery::subsystemName()))
if ((*it == "time") || (*it == "terrasync") || (*it == "events")
|| (*it == "lighting") || (*it == FGScenery::subsystemName()))
{ {
continue; continue;
} }
try { try {
subsystemManger->remove(it->c_str()); subsystemManger->remove(nm.c_str());
} catch (std::exception& e) { } catch (std::exception& e) {
SG_LOG(SG_GENERAL, SG_INFO, "caught std::exception shutting down:" << *it); SG_LOG(SG_GENERAL, SG_INFO, "caught std::exception shutting down:" << nm);
} catch (...) { } catch (...) {
SG_LOG(SG_GENERAL, SG_INFO, "caught generic exception shutting down:" << *it); SG_LOG(SG_GENERAL, SG_INFO, "caught generic exception shutting down:" << nm);
} }
// don't delete here, dropping the ref should be sufficient // don't delete here, dropping the ref should be sufficient
@ -1194,9 +1192,11 @@ void fgStartNewReset()
globals->set_matlib( new SGMaterialLib ); globals->set_matlib( new SGMaterialLib );
// terra-sync needs the property tree root, pass it back in // terra-sync needs the property tree root, pass it back in
simgear::SGTerraSync* terra_sync = static_cast<simgear::SGTerraSync*>(subsystemManger->get_subsystem("terrasync")); auto terra_sync = static_cast<simgear::SGTerraSync*>(subsystemManger->get_subsystem("terrasync"));
terra_sync->setRoot(globals->get_props()); if (terra_sync) {
terra_sync->setRoot(globals->get_props());
}
fgSetBool("/sim/signals/reinit", false); fgSetBool("/sim/signals/reinit", false);
fgSetBool("/sim/freeze/master", false); fgSetBool("/sim/freeze/master", false);
fgSetBool("/sim/sceneryloaded",false); fgSetBool("/sim/sceneryloaded",false);