From ca80161dcf233a23c1324c928bc2c31a1a407b94 Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 29 Dec 2004 20:40:41 +0000 Subject: [PATCH] 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.) --- src/Main/fg_io.cxx | 2 +- src/Main/util.cxx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx index 226417b55..dea77dec2 100644 --- 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 ca3231206..f80e3236a 100644 --- 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); } -- 2.39.5