From: ehofman Date: Sat, 29 Jan 2005 13:12:34 +0000 (+0000) Subject: Put the code at the proper place. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=394fe84351bbb26e254d9f06e8758e3df3b9bb3f;p=flightgear.git Put the code at the proper place. --- diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx index 66d0a4809..924b1b8cf 100644 --- a/src/Main/fg_init.cxx +++ b/src/Main/fg_init.cxx @@ -340,15 +340,15 @@ bool fgInitFGAircraft ( int argc, char **argv ) { } } + if ( aircraft.empty() ) { + // Check for $fg_root/system.fgfsrc + SGPath sysconf( globals->get_fg_root() ); + sysconf.append( "system.fgfsrc" ); + aircraft = fgScanForOption( "--aircraft=", sysconf.str() ); + } // if an aircraft was specified, set the property name if ( !aircraft.empty() ) { SG_LOG(SG_INPUT, SG_INFO, "aircraft = " << aircraft ); - if ( aircraft.empty() ) { - // Check for $fg_root/system.fgfsrc - SGPath sysconf( globals->get_fg_root() ); - sysconf.append( "system.fgfsrc" ); - aircraft = fgScanForOption( "--aircraft=", sysconf.str() ); - } fgSetString("/sim/aircraft", aircraft.c_str() ); } else { SG_LOG(SG_INPUT, SG_INFO, "No user specified aircraft, using default" );