fly/flightgear
1
0
Fork 0
Code Activity

Catch exceptions in FDM init more precisely

Browse source 
Rather than letting these rise to the global handler, do a more
targeted message.
This commit is contained in:
James Turner 2021-07-31 23:04:17 +01:00
parent f6a11ced91
commit 073784fa03
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/FDM/fdm_shell.cxx
View file

@ -170,6 +170,29 @@ void FDMShell::unbind()
_tankProperties.unbind();
}
void FDMShell::doInitAndBind()
{
SG_LOG(SG_FLIGHT, SG_INFO, "Scenery loaded, will init FDM");
try {
_impl->init();
if (_impl->get_bound()) {
_impl->unbind();
}
_impl->bind();
fgSetBool("/sim/fdm-initialized", true);
fgSetBool("/sim/signals/fdm-initialized", true);
} catch (std::exception& e) {
flightgear::fatalMessageBoxThenExit("Aircraft FDM initialization error",
string{"The aircraft flight dynamics model contains errors and cannot be used. ("} + e.what() + ")");
}
if (!copyProperties(_props->getNode("fdm", true),
_initialFdmProperties)) {
SG_LOG(SG_FLIGHT, SG_ALERT, "Failed to save initial FDM property state");
}
}
void FDMShell::update(double dt)
{
if (!_impl) {
@ -189,21 +212,7 @@ void FDMShell::update(double dt)
SGGeod geod = SGGeod::fromDeg(lon, lat);
const auto startUpPositionFialized = fgGetBool("/sim/position-finalized", false);
if (startUpPositionFialized && globals->get_scenery()->scenery_available(geod, range)) {
SG_LOG(SG_FLIGHT, SG_INFO, "Scenery loaded, will init FDM");
_impl->init();
if (_impl->get_bound()) {
_impl->unbind();
}
_impl->bind();
fgSetBool("/sim/fdm-initialized", true);
fgSetBool("/sim/signals/fdm-initialized", true);
if (!copyProperties(_props->getNode("fdm", true),
_initialFdmProperties))
{
SG_LOG(SG_FLIGHT, SG_ALERT, "Failed to save initial FDM property state");
}
doInitAndBind();
}
}

2
src/FDM/fdm_shell.hxx
View file

@ -65,6 +65,8 @@ private:
void validateOutputProperties();
void doInitAndBind();
private:
TankPropertiesList _tankProperties;
SGSharedPtr<FGInterface> _impl;