From 75c20c34d20c33f5756cb779f1579e48112a9abf Mon Sep 17 00:00:00 2001
From: abakkk <abakkk@disroot.org>
Date: Sat, 27 Jun 2020 22:31:31 +0200
Subject: [PATCH] Fix elementGrabberHandler

* Do not start several handler.
* Do not stop handler when toggling drawing mode.
---
 draw.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/draw.js b/draw.js
index a926fd6..24152a9 100644
--- a/draw.js
+++ b/draw.js
@@ -443,6 +443,9 @@ var DrawingArea = new Lang.Class({
     },
     
     _startElementGrabber: function() {
+        if (this.elementGrabberHandler)
+            return;
+        
         this.elementGrabberHandler = this.connect('motion-event', (actor, event) => {
             if (this.motionHandler || this.grabbedElementLocked) {
                 this.grabPoint = null;
@@ -1006,10 +1009,6 @@ var DrawingArea = new Lang.Class({
             this.disconnect(this._onKeyboardPopupMenuHandler);
             this._onKeyboardPopupMenuHandler = null;
         }
-        if (this.elementGrabberHandler) {
-            this.disconnect(this.elementGrabberHandler);
-            this.elementGrabberHandler = null;
-        }
         if (this.motionHandler) {
             this.disconnect(this.motionHandler);
             this.motionHandler = null;