From 515a93a2966cfbefcfd0deaba3df7fd36d0b74c7 Mon Sep 17 00:00:00 2001
From: MSementsov-Ibk <michael.sementsov@ibykus.de>
Date: Wed, 17 Oct 2018 09:04:52 +0200
Subject: [PATCH] Fixed an exception occuring when switching from "draw new" to
 "edit"-tool

Signed-off-by: Michael Sementsov <michael.sementsov@ibykus.de>
---
 .../org/locationtech/udig/tools/edit/EditToolHandler.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/plugins/org.locationtech.udig.tool.edit/src/org/locationtech/udig/tools/edit/EditToolHandler.java b/plugins/org.locationtech.udig.tool.edit/src/org/locationtech/udig/tools/edit/EditToolHandler.java
index baa6dfa1d3..0dcbddee52 100644
--- a/plugins/org.locationtech.udig.tool.edit/src/org/locationtech/udig/tools/edit/EditToolHandler.java
+++ b/plugins/org.locationtech.udig.tool.edit/src/org/locationtech/udig/tools/edit/EditToolHandler.java
@@ -128,13 +128,14 @@ protected void setActive( boolean active ) {
             enableListeners();
 
         } else {
-            basicDisablement();
-            disableListeners();
 
             List<Behaviour> list = acceptBehaviours;
 
             BehaviourCommand command = getCommand(list);
-            getContext().sendASyncCommand(command);
+            getContext().sendSyncCommand(command);
+            
+            basicDisablement();
+            disableListeners();
             setCurrentState(EditState.NONE);
         }
     }