- remove evil exit()
- remove "enabled". It's unused, and that's a good thing: it wasn't initialized.
This commit is contained in:
parent
79abf11466
commit
5fa474e209
2 changed files with 4 additions and 12 deletions
|
@ -64,16 +64,10 @@ FGInstrumentMgr::FGInstrumentMgr ()
|
||||||
try {
|
try {
|
||||||
readProperties( config.str(), config_props );
|
readProperties( config.str(), config_props );
|
||||||
|
|
||||||
if ( build() ) {
|
if ( !build() ) {
|
||||||
enabled = true;
|
throw sg_throwable(string(
|
||||||
} else {
|
"Detected an internal inconsistency in the instrumentation\n"
|
||||||
SG_LOG( SG_ALL, SG_ALERT,
|
"system specification file. See earlier errors for details."));
|
||||||
"Detected an internal inconsistency in the instrumentation");
|
|
||||||
SG_LOG( SG_ALL, SG_ALERT,
|
|
||||||
" system specification file. See earlier errors for" );
|
|
||||||
SG_LOG( SG_ALL, SG_ALERT,
|
|
||||||
" details.");
|
|
||||||
exit(-1);
|
|
||||||
}
|
}
|
||||||
} catch (const sg_exception& exc) {
|
} catch (const sg_exception& exc) {
|
||||||
SG_LOG( SG_ALL, SG_ALERT, "Failed to load instrumentation system model: "
|
SG_LOG( SG_ALL, SG_ALERT, "Failed to load instrumentation system model: "
|
||||||
|
|
|
@ -35,8 +35,6 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
SGPropertyNode *config_props;
|
SGPropertyNode *config_props;
|
||||||
bool enabled;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // __INSTRUMENT_MGR_HXX
|
#endif // __INSTRUMENT_MGR_HXX
|
||||||
|
|
Loading…
Reference in a new issue