summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbulia byak <buliabyak@gmail.com>2008-07-05 00:52:25 +0000
committerbuliabyak <buliabyak@users.sourceforge.net>2008-07-05 00:52:25 +0000
commited2ffaadf35014cb80d5aacc4e3a37be5fdac9f0 (patch)
treea4728839b348e9a4cc450c1ca6426c90fcb7904d
parentcreate pathvector_for_curve method. (diff)
downloadinkscape-ed2ffaadf35014cb80d5aacc4e3a37be5fdac9f0.tar.gz
inkscape-ed2ffaadf35014cb80d5aacc4e3a37be5fdac9f0.zip
fix crash triggered by having both knotholder and nodepath at the same time
(bzr r6161)
-rw-r--r--src/shape-editor.cpp8
1 files changed, 2 insertions, 6 deletions
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 () {