From: buliabyak <buliabyak@users.sourceforge.net>
Date: Sat, 5 Jul 2008 00:52:25 +0000 (+0000)
Subject: fix crash triggered by having both knotholder and nodepath at the same time
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4fbae89ffc21c9f9a768a2a12c2c502922370cb1;p=inkscape.git

fix crash triggered by having both knotholder and nodepath at the same time
---

diff --git a/src/shape-editor.cpp b/src/shape-editor.cpp
index 4b71184e4..6b488af82 100644
--- a/src/shape-editor.cpp
+++ b/src/shape-editor.cpp
@@ -96,12 +96,8 @@ bool ShapeEditor::has_knotholder () {
 }
 
 bool ShapeEditor::has_local_change () {
-    if (this->nodepath)
-        return (this->nodepath->local_change != 0);
-    else if (this->knotholder)
-        return (this->knotholder->local_change != 0);
-    else
-        return false;
+    return ((this->nodepath && this->nodepath->local_change) ||
+            (this->knotholder && this->knotholder->local_change != 0));
 }
 
 void ShapeEditor::decrement_local_change () {