Reset "/sim/startup/time-offset-type" when specifying "--time-offset" in

case some other conflicting option has set this to something else.

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index b6cd6741dc40dcb3da5ce2c0f57300ee4321bfd1..8302a331d7b9ffa3021d1706b411a340440f4600 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -774,25 +774,20 @@ parse_option (const string& arg)
        fgSetString("/sim/startup/units", "meters");
     } else if ( arg.find( "--time-offset" ) == 0 ) {
         fgSetInt("/sim/startup/time-offset",
-                          parse_time_offset( (arg.substr(14)) ));
+                 parse_time_offset( (arg.substr(14)) ));
+       fgSetString("/sim/startup/time-offset-type", "system-offset");
     } else if ( arg.find( "--time-match-real") == 0 ) {
-        fgSetString("/sim/startup/time-offset-type",
-                             "system-offset");
+        fgSetString("/sim/startup/time-offset-type", "system-offset");
     } else if ( arg.find( "--time-match-local") == 0 ) {
-        fgSetString("/sim/startup/time-offset-type",
-                             "latitude-offset");
+        fgSetString("/sim/startup/time-offset-type", "latitude-offset");
     } else if ( arg.find( "--start-date-sys=") == 0 ) {
-        fgSetInt("/sim/startup/time-offset",
-                          parse_date((arg.substr(17))));
+        fgSetInt("/sim/startup/time-offset", parse_date((arg.substr(17))));
        fgSetString("/sim/startup/time-offset-type", "system");
     } else if ( arg.find( "--start-date-lat=") == 0 ) {
-        fgSetInt("/sim/startup/time-offset",
-                          parse_date((arg.substr(17))));
-       fgSetString("/sim/startup/time-offset-type",
-                          "latitude");
+        fgSetInt("/sim/startup/time-offset", parse_date((arg.substr(17))));
+       fgSetString("/sim/startup/time-offset-type", "latitude");
     } else if ( arg.find( "--start-date-gmt=") == 0 ) {
-        fgSetInt("/sim/startup/time-offset",
-                          parse_date((arg.substr(17))));
+        fgSetInt("/sim/startup/time-offset", parse_date((arg.substr(17))));
        fgSetString("/sim/startup/time-offset-type", "gmt");
     } else if ( arg == "--hud-tris" ) {
         fgSetString("/sim/hud/frame-stat-type", "tris");