Cleaned up the network code a bit. Now the window is locked while communication s going on to prevent network clutching.

1 files changed, 4 insertions, 8 deletions

diff --git a/client/macrowindow.cc b/client/macrowindow.cc
index 360488e..37129aa 100644
--- a/client/macrowindow.cc
+++ b/client/macrowindow.cc
@@ -26,6 +26,7 @@
  */
 #include "macrowindow.h"
 
+//#include <QApplication>
 #include <QVBoxLayout>
 #include <QMessageBox>
 #include <QDomDocument>
@@ -65,12 +66,6 @@ MacroWindow::~MacroWindow()
 
 void MacroWindow::update(QDomNode &node)
 {
-  //  if(mainwidget) delete mainwidget;
-  //  if(resumewidget) delete resumewidget;
-
-  //  mainwidget = new QLabel("Expanded");
-  //  resumewidget = new QLabel("Collapsed");
-
   mainwidget = NULL;
 
   widgets.clear();
@@ -151,7 +146,7 @@ bool MacroWindow::doCommit()
 
   // If all entries passed validation, continue commit
   if(faulty == 0) {
-    netcom.send(widgets, course, macro, version);
+    netcom.send(widgets, macro, version);
     emit updateOnCommit();
     setCollapsed(true);
     return true;
@@ -279,10 +274,11 @@ void MacroWindow::addAuxWidgets(QVector< Widget* > ws)
 
 void MacroWindow::toggleMacro()
 {
-
   if(isCollapsed()) {
     widgets.clear();
     auxwidgets.clear();
+    luaprograms.clear();
+
     QDomDocument xml_doc = netcom.send(course, macro);
 
     //