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 8ee2d9b443f7db287d11c0431fada9129d5508a6..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");
@@ -429,7 +427,7 @@ void fgHiResDump()
 
     message = "Snapshot saved to \"";
     message += filename;
-    message += '".';
+    message += "\".";
     mkDialog (message.c_str());
 
     free(tile);