summaryrefslogtreecommitdiffstats
path: root/src/live_effects/lpeobject.cpp
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2008-02-06 22:47:05 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2008-02-06 22:47:05 +0000
commitc5521d9a406b0a222314da630cf6215a8c01db79 (patch)
tree80fea4e5c77701ca2ca8bc78c734f7b126070906 /src/live_effects/lpeobject.cpp
parentadd extra note of importance to EnumDataConverter and add is_valid_id method (diff)
downloadinkscape-c5521d9a406b0a222314da630cf6215a8c01db79.tar.gz
inkscape-c5521d9a406b0a222314da630cf6215a8c01db79.zip
Fix wrong identification of invalid effects (for unknown effects, it used to default to Bend Path). Now it is reckognized as invalid effect, but still the effect is executed: meaning that "original-d" is copied to "d" instead of keeping "d" attrib. That still needs to be fixed.
(bzr r4672)
Diffstat (limited to '')
-rw-r--r--src/live_effects/lpeobject.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/live_effects/lpeobject.cpp b/src/live_effects/lpeobject.cpp
index bcb01463a..e7810fc28 100644
--- a/src/live_effects/lpeobject.cpp
+++ b/src/live_effects/lpeobject.cpp
@@ -182,11 +182,9 @@ livepatheffect_set(SPObject *object, unsigned key, gchar const *value)
lpeobj->lpe = NULL;
}
- if (value) {
+ if ( value && Inkscape::LivePathEffect::LPETypeConverter.is_valid_key(value) ) {
lpeobj->effecttype = Inkscape::LivePathEffect::LPETypeConverter.get_id_from_key(value);
- if (lpeobj->effecttype != Inkscape::LivePathEffect::INVALID_LPE) {
- lpeobj->lpe = Inkscape::LivePathEffect::Effect::New(lpeobj->effecttype, lpeobj);
- }
+ lpeobj->lpe = Inkscape::LivePathEffect::Effect::New(lpeobj->effecttype, lpeobj);
lpeobj->effecttype_set = true;
} else {
lpeobj->effecttype = Inkscape::LivePathEffect::INVALID_LPE;