fly/flightgear
1
0
Fork 0
Code Activity

Fix a package crash on startup.

Browse source
This commit is contained in:
James Turner 2015-10-15 20:05:35 -05:00
parent 2314ccfe13
commit ca1f8cddc9
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Main/fg_init.cxx
View file

@ -546,9 +546,11 @@ int fgInitAircraft(bool reinit)
// code in FindAndCacheAircraft works as normal
// note since we may be using a variant, we can't use the package ID
size_t lastDot = aircraftId.rfind('.');
assert(lastDot != std::string::npos);
aircraftId = aircraftId.substr(lastDot + 1);
if (lastDot == std::string::npos) {
aircraftId = aircraftId.substr(lastDot + 1);
}
aircraftProp->setStringValue(aircraftId);
// run the traditional-code path below
} else {
#if 0
@ -559,6 +561,7 @@ int fgInitAircraft(bool reinit)
return flightgear::FG_OPTIONS_ERROR;
#endif
// fall back the default aircraft instead
}
}