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.)
This commit is contained in:
parent
3ad6d87576
commit
ca80161dcf
2 changed files with 1 additions and 2 deletions
|
@ -320,7 +320,7 @@ void
|
||||||
FGIO::shutdown_all() {
|
FGIO::shutdown_all() {
|
||||||
FGProtocol *p;
|
FGProtocol *p;
|
||||||
|
|
||||||
// cout << "processing I/O channels" << endl;
|
// cout << "shutting down all I/O channels" << endl;
|
||||||
|
|
||||||
typedef vector< FGProtocol* > container;
|
typedef vector< FGProtocol* > container;
|
||||||
container::iterator i = io_channels.begin();
|
container::iterator i = io_channels.begin();
|
||||||
|
|
|
@ -106,7 +106,6 @@ fgExit (int status)
|
||||||
{
|
{
|
||||||
SG_LOG(SG_GENERAL, SG_INFO, "Exiting FlightGear with status " << status);
|
SG_LOG(SG_GENERAL, SG_INFO, "Exiting FlightGear with status " << status);
|
||||||
|
|
||||||
globals->get_io()->shutdown_all();
|
|
||||||
exit(status);
|
exit(status);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue