FGIO::shutdown_all() is called from the FGIO destructor so remove the extra

explicit calls to shutdown_all() which was causing this to be called twice.
This could cause problems with some IO modules (such as attempting to close
an invalid file descriptor the second time.)

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 226417b5545c13755727e2d777489d7247c4e933..dea77dec26267cb311226963910e9825a394009c 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -320,7 +320,7 @@ void
 FGIO::shutdown_all() {
     FGProtocol *p;
 
-    // cout << "processing I/O channels" << endl;
+    // cout << "shutting down all I/O channels" << endl;
 
     typedef vector< FGProtocol* > container;
     container::iterator i = io_channels.begin();

diff --git a/src/Main/util.cxx b/src/Main/util.cxx
index ca3231206db146073d6ebc257c9bfeafaf3ae714..f80e3236aa2a412d2e3f6c93efbff561f60a336a 100644 (file)
--- a/src/Main/util.cxx
+++ b/src/Main/util.cxx
@@ -106,7 +106,6 @@ fgExit (int status)
 {
     SG_LOG(SG_GENERAL, SG_INFO, "Exiting FlightGear with status " << status);
 
-    globals->get_io()->shutdown_all();
     exit(status);
 }