summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2017-05-30 15:32:06 +0000
committerjabiertxof <info@marker.es>2017-05-30 15:32:06 +0000
commitb1b37cc376e531f2be21f5ce6ce27c33127d7283 (patch)
tree3a3b52a88620f04bad6106e557973f85ccb1883b /src
parentWorking on hide (diff)
parentFix broken fix for bug pointed by parclytaxel in IRC (diff)
downloadinkscape-b1b37cc376e531f2be21f5ce6ce27c33127d7283.tar.gz
inkscape-b1b37cc376e531f2be21f5ce6ce27c33127d7283.zip
Update to trunk
(bzr r15712)
Diffstat (limited to 'src')
-rw-r--r--src/sp-lpe-item.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index be886bdd2..84d318db2 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
@@ -555,19 +555,21 @@ void SPLPEItem::removeAllPathEffects(bool keep_paths)
return;
}
}
- for (PathEffectList::const_iterator it = path_effect_list->begin(); it != path_effect_list->end(); ++it)
- {
+
+ PathEffectList::iterator it = this->path_effect_list->begin();
+
+ while ( it != this->path_effect_list->end() ) {
LivePathEffectObject *lpeobj = (*it)->lpeobject;
if (lpeobj) {
Inkscape::LivePathEffect::Effect * lpe = lpeobj->get_lpe();
lpe->keep_paths = keep_paths;
lpe->doOnRemove(this);
}
+ // unlink and delete all references in the list
(*it)->unlink();
delete *it;
it = this->path_effect_list->erase(it);
}
-
this->getRepr()->setAttribute("inkscape:path-effect", NULL);
if (!keep_paths) {