From 4b856b508ac34108691d54ac32260ea586e97058 Mon Sep 17 00:00:00 2001
From: mfranz <mfranz>
Date: Thu, 27 Apr 2006 10:35:03 +0000
Subject: [PATCH] cosmetics: - only call globals->set_initial_waypoints() if
 the waypoints list address   has actually changed, that is: if it has just
 been initialized - remove trailing spaces - fix indentation

---
 src/Main/options.cxx | 60 +++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index b1c9d522b..6c9a8b43b 100644
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -536,56 +536,58 @@ add_channel( const string& type, const string& channel_str ) {
     return true;
 }
 
-// The parse wp and parse flight-plan options don't work anymore, because 
+
+// The parse wp and parse flight-plan options don't work anymore, because
 // the route manager and the airport subsystems have not yet been initialized
-// at this stage. 
+// at this stage.
 
 // Parse --wp=ID[@alt]
-static void 
+static void
 parse_wp( const string& arg ) {
     string_list *waypoints = globals->get_initial_waypoints();
     if (!waypoints) {
         waypoints = new string_list;
+        globals->set_initial_waypoints(waypoints);
     }
     waypoints->push_back(arg);
-    globals->set_initial_waypoints(waypoints);
 }
 
 
 // Parse --flight-plan=[file]
-static bool 
+static bool
 parse_flightplan(const string& arg)
 {
-  string_list *waypoints = globals->get_initial_waypoints();
-  if (!waypoints)
-    waypoints = new string_list;
-  sg_gzifstream in(arg.c_str());
-  if ( !in.is_open() ) {
-    return false;
-  }
-  while ( true ) {
-    string line;
-    
+    string_list *waypoints = globals->get_initial_waypoints();
+    if (!waypoints) {
+        waypoints = new string_list;
+        globals->set_initial_waypoints(waypoints);
+    }
+
+    sg_gzifstream in(arg.c_str());
+    if ( !in.is_open() )
+        return false;
+
+    while ( true ) {
+        string line;
+
 #if defined( macintosh )
-    getline( in, line, '\r' );
+        getline( in, line, '\r' );
 #else
-    getline( in, line, '\n' );
+        getline( in, line, '\n' );
 #endif
-    
-    // catch extraneous (DOS) line ending character
-    if ( line[line.length() - 1] < 32 ) {
-      line = line.substr( 0, line.length()-1 );
+        // catch extraneous (DOS) line ending character
+        if ( line[line.length() - 1] < 32 )
+            line = line.substr( 0, line.length()-1 );
+
+        if ( in.eof() )
+            break;
+
+        waypoints->push_back(line);
     }
-    
-    if ( in.eof() ) {
-      break;
-    }
-    waypoints->push_back(line);
-  }
-  globals->set_initial_waypoints(waypoints);
-  return true;
+    return true;
 }
 
+
 static int
 fgOptLanguage( const char *arg )
 {