From 6191fae10633b6c5f9c4223bdf95413b41f59d49 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Wed, 13 Feb 2002 19:41:05 +0000
Subject: [PATCH] Reset "/sim/startup/time-offset-type" when specifying
 "--time-offset" in case some other conflicting option has set this to
 something else.

---
 src/Main/options.cxx | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index b6cd6741d..8302a331d 100644
--- 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");
-- 
2.39.5