Only test for --fg-root and --aircraft in ~/.fgfsrc et all if it wasn't specified...

[flightgear.git] / src / Main / fg_init.cxx

diff --git a/src/Main/fg_init.cxx b/src/Main/fg_init.cxx
index 1a37f6a64815135122c3155ec4371dd6d8f190cf..5ad9476021430d06c3222f18f74720a1bb372b36 100644 (file)
--- a/src/Main/fg_init.cxx
+++ b/src/Main/fg_init.cxx
@@ -263,7 +263,8 @@ bool fgInitFGRoot ( int argc, char **argv ) {
     root = fgScanForOption( "--fg-root=", argc, argv);
 
     // Check in one of the user configuration files.
-    root = fgScanForOption( "--fg-root=" );
+    if (root.empty() )
+        root = fgScanForOption( "--fg-root=" );
     
     // Next check if fg-root is set as an env variable
     if ( root.empty() ) {
@@ -323,7 +324,8 @@ bool fgInitFGAircraft ( int argc, char **argv ) {
     aircraft = fgScanForOption( "--aircraft=", argc, argv );
 
     // Check in one of the user configuration files.
-    aircraft = fgScanForOption( "--aircraft=" );
+    if ( aircraft.empty() )
+        aircraft = fgScanForOption( "--aircraft=" );
 
     // if an aircraft was specified, set the property name
     if ( !aircraft.empty() ) {