Made macrowindow clean up proprely when closed (thus terminating dangling db connections through dbwidget).

1 files changed, 16 insertions, 1 deletions

diff --git a/client/macrowindow.cc b/client/macrowindow.cc
index b0eab65..5ef342d 100644
--- a/client/macrowindow.cc
+++ b/client/macrowindow.cc
@@ -61,6 +61,21 @@ MacroWindow::MacroWindow(QDomNode &xml_doc)
 MacroWindow::~MacroWindow()
 {
   delete lua;
+
+  QVector< Widget* >::iterator i = widgets.begin();
+  while (i != widgets.end()) {
+    Widget* w = *i;
+    delete w;
+    i++;
+  }
+
+  QVector< Widget* >::iterator j = auxwidgets.begin();
+  while (j != auxwidgets.end()) {
+    Widget* w = *j;
+    delete w;
+    j++;
+  }
+
 }
 
 void MacroWindow::initMacro(QDomNode &node)
@@ -200,7 +215,7 @@ void MacroWindow::cont(QString name)
 
 bool MacroWindow::isClosed()
 {
-  return isclosed;
+  return isclosed || mainwidget->isVisible() == false;
 }
 
 Widget *MacroWindow::getWidget(QString name)