1 files changed, 8 insertions, 2 deletions
diff --git a/client/macrodrawer.cc b/client/macrodrawer.cc
index 72395bb..ec761e9 100644
--- a/client/macrodrawer.cc
+++ b/client/macrodrawer.cc
@@ -53,7 +53,8 @@ MacroDrawer::MacroDrawer(MacroWindow *p, QString title)
     }
 
     installEventFilter(this);
-    connect(b, SIGNAL(clicked()), mw, SLOT(toggleMacro()));
+    //    connect(b, SIGNAL(clicked()), mw, SLOT(toggleMacro()));
+    connect(b, SIGNAL(clicked()), this, SLOT(toggleMe()));
   }
 }
 
@@ -61,7 +62,12 @@ bool MacroDrawer::eventFilter(QObject *obj, QEvent *event)
 {
   if(event->type() == QEvent::MouseButtonRelease) {
     QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
-    if(mouseEvent->y() < 16) mw->toggleMacro(); // Only activate when clicking the top.
+    if(mouseEvent->y() < 16 && isEnabled()) toggle();//mw->toggleMacro(); // Only activate when clicking the top.
   }
   return QObject::eventFilter(obj, event);
 }
+
+void MacroDrawer::toggleMe()
+{
+  emit toggle();
+}