From eb56a2ca0faf7a0e7b8da2f149a9d88783314d82 Mon Sep 17 00:00:00 2001
From: Alex Merry <dev@randomguy3.me.uk>
Date: Sun, 1 Sep 2013 12:05:17 +0100
Subject: GTK: Properly clear the renderer from the old tool

Fixes, for example, unsetting the cursor when changing from the bounding
box tool.
---
 tikzit/src/gtk/GraphEditorPanel.m | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'tikzit/src/gtk/GraphEditorPanel.m')

diff --git a/tikzit/src/gtk/GraphEditorPanel.m b/tikzit/src/gtk/GraphEditorPanel.m
index c1fdffd..dac52a0 100644
--- a/tikzit/src/gtk/GraphEditorPanel.m
+++ b/tikzit/src/gtk/GraphEditorPanel.m
@@ -96,13 +96,16 @@ static const InputMask zoomPanMask = ControlMask;
     [[[renderer document] pickSupport] deselectAllNodes];
     [[[renderer document] pickSupport] deselectAllEdges];
 
-    BOOL hadOldTool = ([tool activeRenderer] == renderer);
-
     id oldTool = tool;
+    BOOL weHadTool = ([oldTool activeRenderer] == renderer);
+    if (weHadTool) {
+        [oldTool setActiveRenderer:nil];
+    }
+
     tool = [t retain];
     [oldTool release];
 
-    if (hadOldTool) {
+    if (weHadTool) {
         [self grabTool];
     }
 }
-- 
cgit v1.2.3