don't destroy iterated map entries; delete _menubar; restore closed

[flightgear.git] / src / GUI / gui_funcs.cxx

diff --git a/src/GUI/gui_funcs.cxx b/src/GUI/gui_funcs.cxx
index 7073a2887588fbc4378ecdb147ce3aa9efc23b41..07a1b215acfba89539b0be636aee7282a8b4bce9 100644 (file)
--- a/src/GUI/gui_funcs.cxx
+++ b/src/GUI/gui_funcs.cxx
@@ -69,10 +69,10 @@
 
 #include <Include/general.hxx>
 #include <Aircraft/aircraft.hxx>
+#include <Aircraft/controls.hxx>
 #include <Airports/simple.hxx>
 #include <Autopilot/auto_gui.hxx>
 #include <Cockpit/panel.hxx>
-#include <Controls/controls.hxx>
 #include <FDM/flight.hxx>
 #include <Main/main.hxx>
 #include <Main/fg_init.hxx>
@@ -166,10 +166,8 @@ void mkDialog (const char *txt)
 {
     NewGUI *gui = (NewGUI *)globals->get_subsystem("gui");
     SGPropertyNode_ptr dlg = gui->getDialog("message");
-    if (!dlg) {
-        SG_LOG(SG_GENERAL, SG_ALERT, "'message' dialog missing");
+    if (!dlg)
         return;
-    }
 
     dlg->setStringValue("text/label", txt);
     dlg->setStringValue("button/legend", "OK");
@@ -427,17 +425,14 @@ void fgHiResDump()
 
     fclose(f);
 
-    message = "Snap shot saved to ";
+    message = "Snapshot saved to \"";
     message += filename;
+    message += "\".";
     mkDialog (message.c_str());
 
     free(tile);
     free(buffer);
 
-    // message = "Snap shot saved to ";
-    // message += filename;
-    // mkDialog (message.c_str());
-
     delete [] filename;
 
     if ( show_pu_cursor ) {
@@ -569,11 +564,13 @@ void fgDumpSnapShot () {
     if ( sg_glDumpWindow( filename,
                          fgGetInt("/sim/startup/xsize"), 
                          fgGetInt("/sim/startup/ysize")) ) {
-       message = "Snap shot saved to ";
+       message = "Snapshot saved to \"";
        message += filename;
+       message += "\".";
     } else {
-        message = "Failed to save to ";
+        message = "Failed to save to \"";
        message += filename;
+       message += "\".";
     }
 
     mkDialog (message.c_str());