In the process of changing, adding and removing files the last few years

[flightgear.git] / src / Main / bootstrap.cxx

diff --git a/src/Main/bootstrap.cxx b/src/Main/bootstrap.cxx
index f3e3daecad7954bd831dbc2c6c8cc5e9450b7cc4..814cab6017f404ce1a72cebce9592c12abb56b6d 100644 (file)
--- a/src/Main/bootstrap.cxx
+++ b/src/Main/bootstrap.cxx
@@ -195,8 +195,10 @@ int main ( int argc, char **argv ) {
                             // We must use cerr rather than
                             // logging, since logging may be
                             // disabled.
-        cerr << "Fatal error: " << t.getFormattedMessage()
-             << "\n (received from " << t.getOrigin() << ')' << endl;
+        cerr << "Fatal error: " << t.getFormattedMessage() << endl;
+        if (!t.getOrigin().empty())
+            cerr << " (received from " << t.getOrigin() << ')' << endl;
+
     } catch (...) {
         cerr << "Unknown exception in the main loop. Aborting..." << endl;
         perror("Possible cause");
@@ -212,7 +214,6 @@ void fgExitCleanup() {
     if (_bootstrap_OSInit != 0)
         fgSetMouseCursor(MOUSE_CURSOR_POINTER);
 
-    if (globals)
-        delete globals;
+    delete globals;
 }