From 7e68da8d1bc6a91031fa4a05cc5f8ca032bd960d Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebronyat-signgmaildotcom>
Date: Sat, 19 Jul 2014 18:06:37 -0400
Subject: Workarounds for crash bugs 1309050, 601336; will fix properly in
 experimental

Fixed bugs:
  - https://launchpad.net/bugs/601336
  - https://launchpad.net/bugs/1309050

(bzr r13455)
---
 src/knot.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/knot.cpp')

diff --git a/src/knot.cpp b/src/knot.cpp
index 61d0dff39..a3bb85b2b 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -162,6 +162,9 @@ SPKnot::~SPKnot() {
         g_free(this->tip);
         this->tip = NULL;
     }
+
+    // cannot snap to destroyed knot
+    sp_event_context_discard_delayed_snap_event(this->desktop->event_context);
 }
 
 void SPKnot::startDragging(Geom::Point const &p, gint x, gint y, guint32 etime) {
@@ -282,7 +285,7 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
                     knot->setFlag(SP_KNOT_DRAGGING, TRUE);
                 }
 
-                sp_event_context_snap_delay_handler(knot->desktop->event_context, NULL, (gpointer) knot, (GdkEventMotion *)event, Inkscape::UI::Tools::DelayedSnapEvent::KNOT_HANDLER);
+                sp_event_context_snap_delay_handler(knot->desktop->event_context, NULL, knot, (GdkEventMotion *)event, Inkscape::UI::Tools::DelayedSnapEvent::KNOT_HANDLER);
                 sp_knot_handler_request_position(event, knot);
                 moved = TRUE;
             }
-- 
cgit v1.2.3