From 4007abe02509fc1e312a007fb26f31c5a595df26 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebronyat-signgmaildotcom>
Date: Thu, 3 Apr 2014 21:04:51 -0400
Subject: Begin first stage of resolving issue with duplicate knots

(bzr r13090.1.46)
---
 src/knotholder.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/knotholder.cpp')

diff --git a/src/knotholder.cpp b/src/knotholder.cpp
index cf87423d4..94a041385 100644
--- a/src/knotholder.cpp
+++ b/src/knotholder.cpp
@@ -203,14 +203,16 @@ KnotHolder::knot_ungrabbed_handler(SPKnot */*knot*/, guint)
         /* do cleanup tasks (e.g., for LPE items write the parameter values
          * that were changed by dragging the handle to SVG)
          */
-        if (SP_IS_LPE_ITEM(object)) {
+        if (dynamic_cast<SPLPEItem*> (object)) {
             // This writes all parameters to SVG. Is this sufficiently efficient or should we only
             // write the ones that were changed?
-
-            Inkscape::LivePathEffect::Effect *lpe = SP_LPE_ITEM(object)->getCurrentLPE();
-            if (lpe) {
-                LivePathEffectObject *lpeobj = lpe->getLPEObj();
-                lpeobj->updateRepr();
+            SPLPEItem * lpeitem = SP_LPE_ITEM(this->item);
+            if (lpeitem) {
+                Inkscape::LivePathEffect::Effect *lpe = lpeitem->getCurrentLPE();
+                if (lpe) {
+                    LivePathEffectObject *lpeobj = lpe->getLPEObj();
+                    lpeobj->updateRepr();
+                }
             }
         }
 
-- 
cgit v1.2.3


From 09ab1cca2d7fb8cdbb252feb4d1ef7945249c051 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebronyat-signgmaildotcom>
Date: Fri, 4 Apr 2014 15:37:48 -0400
Subject: Prevent crash on "three knot" issue

(bzr r13090.1.47)
---
 src/knotholder.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/knotholder.cpp')

diff --git a/src/knotholder.cpp b/src/knotholder.cpp
index 94a041385..30a7e58d5 100644
--- a/src/knotholder.cpp
+++ b/src/knotholder.cpp
@@ -234,9 +234,14 @@ KnotHolder::knot_ungrabbed_handler(SPKnot */*knot*/, guint)
             else
                 object_verb = SP_VERB_SELECTION_DYNAMIC_OFFSET;
         }
-
-        DocumentUndo::done(object->document, object_verb,
-                           _("Move handle"));
+        if (object) { //increasingly aggressive sanity checks
+            if (object->document) {
+                if (object_verb <= SP_VERB_LAST && object_verb >= SP_VERB_INVALID) {
+                    DocumentUndo::done(object->document, object_verb,
+                                       _("Move handle"));
+                }
+            }
+        } //else { abort(); }
     }
 }
 
-- 
cgit v1.2.3


From 6f508cfcaa161695711309d3413b90d2b3f44ea0 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebronyat-signgmaildotcom>
Date: Mon, 14 Apr 2014 21:50:06 -0400
Subject: Minor things

(bzr r13090.1.58)
---
 src/knotholder.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/knotholder.cpp')

diff --git a/src/knotholder.cpp b/src/knotholder.cpp
index 30a7e58d5..aea983cbb 100644
--- a/src/knotholder.cpp
+++ b/src/knotholder.cpp
@@ -154,8 +154,15 @@ KnotHolder::knot_clicked_handler(SPKnot *knot, guint state)
     }
 
     // for drag, this is done by ungrabbed_handler, but for click we must do it here
-    DocumentUndo::done(saved_item->document, object_verb,
-                       _("Change handle"));
+    
+    if (saved_item) { //increasingly aggressive sanity checks
+       if (saved_item->document) {
+            if (object_verb <= SP_VERB_LAST && object_verb >= SP_VERB_INVALID) {
+                DocumentUndo::done(saved_item->document, object_verb,
+                                   _("Change handle"));
+            }
+       }
+    } // else { abort(); }
 }
 
 void
-- 
cgit v1.2.3


From b9a8b72cd7bb5c6dbfe5118f15fa870cff8eb4c5 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Thu, 31 Jul 2014 14:53:10 -0400
Subject: I'm an idiot

(bzr r13090.1.97)
---
 src/knotholder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/knotholder.cpp')

diff --git a/src/knotholder.cpp b/src/knotholder.cpp
index aea983cbb..9890647e1 100644
--- a/src/knotholder.cpp
+++ b/src/knotholder.cpp
@@ -213,7 +213,7 @@ KnotHolder::knot_ungrabbed_handler(SPKnot */*knot*/, guint)
         if (dynamic_cast<SPLPEItem*> (object)) {
             // This writes all parameters to SVG. Is this sufficiently efficient or should we only
             // write the ones that were changed?
-            SPLPEItem * lpeitem = SP_LPE_ITEM(this->item);
+            SPLPEItem * lpeitem = SP_LPE_ITEM(object);
             if (lpeitem) {
                 Inkscape::LivePathEffect::Effect *lpe = lpeitem->getCurrentLPE();
                 if (lpe) {
-- 
cgit v1.2.3