From 9125e5147952cb8ce3d9f8b1fc833be98b4d0447 Mon Sep 17 00:00:00 2001
From: Markus Engel <markus.engel@tum.de>
Date: Sat, 1 Mar 2014 21:26:55 +0100
Subject: Fix for crashes on fast tool toggling.

Fixed bugs:
  - https://launchpad.net/bugs/1265376

(bzr r13087)
---
 src/ui/tools/dropper-tool.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/ui/tools/dropper-tool.cpp')

diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index e9e2d6c39..99d42a211 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -336,6 +336,10 @@ bool DropperTool::root_handler(GdkEvent* event) {
                 if (prefs->getBool("/tools/dropper/onetimepick", false)) {
                     prefs->setBool("/tools/dropper/onetimepick", false);
                     sp_toggle_dropper(desktop);
+
+                    // sp_toggle_dropper will delete ourselves.
+                    // Thus, make sure we return immediately.
+                    return true;
                 }
 
                 ret = TRUE;
-- 
cgit v1.2.3