From 7f2d487d23d4b0e95ceb8d1cc4ad6ffb18a32f90 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza Cenoz <jabier.arraiza@marker.es>
Date: Mon, 7 Nov 2016 19:53:29 +0100
Subject: Fix some bugs

(bzr r15142.1.37)
---
 src/ui/tools/tool-base.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index c789b44bb..ca700f652 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -373,6 +373,8 @@ bool ToolBase::root_handler(GdkEvent* event) {
 
                     ret = TRUE;
                 }
+                desktop->canvas->clearRotateTo();
+                this->rotating_mode = false;
                 break;
 
             case 2:
@@ -420,6 +422,8 @@ bool ToolBase::root_handler(GdkEvent* event) {
                     sp_event_root_menu_popup(desktop, NULL, event);
                 }
                 ret = TRUE;
+                desktop->canvas->clearRotateTo();
+                this->rotating_mode = false;
                 break;
 
             default:
@@ -836,9 +840,7 @@ bool ToolBase::root_handler(GdkEvent* event) {
             if (this->rotating_mode) {
                 desktop->canvas->clearRotateTo();
                 this->rotating_mode = false;
-                ret = TRUE;
                 desktop->canvas->endRotateTo();
-                break;
             }
             bool ctrl = (event->scroll.state & GDK_CONTROL_MASK);
             bool wheelzooms = prefs->getBool("/options/wheelzooms/value");
-- 
cgit v1.2.3