From 09c1fee60bcd713fe66178021053d59e3f649660 Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Sat, 14 Sep 2013 16:37:55 -0400
Subject: Fix bug with tool handles during document unit change.

(bzr r12475.1.17)
---
 src/shape-editor.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/shape-editor.cpp')

diff --git a/src/shape-editor.cpp b/src/shape-editor.cpp
index 71018d89b..59d43f24c 100644
--- a/src/shape-editor.cpp
+++ b/src/shape-editor.cpp
@@ -35,6 +35,8 @@
 
 using Inkscape::createKnotHolder;
 
+bool ShapeEditor::_blockSetItem = false;
+
 ShapeEditor::ShapeEditor(SPDesktop *dt) {
     this->desktop = dt;
     this->knotholder = NULL;
@@ -169,6 +171,10 @@ static Inkscape::XML::NodeEventVector shapeeditor_repr_events = {
 
 
 void ShapeEditor::set_item(SPItem *item, SubType type, bool keep_knotholder) {
+    if (_blockSetItem) {
+        return;
+    }
+
     // this happens (and should only happen) when for an LPEItem having both knotholder and
     // nodepath the knotholder is adapted; in this case we don't want to delete the knotholder
     // since this freezes the handles
-- 
cgit v1.2.3