summaryrefslogtreecommitdiffstats
path: root/src/sp-lpe-item.cpp
diff options
context:
space:
mode:
authorShlomi Fish <shlomif@shlomifish.org>2016-10-08 15:39:06 +0000
committerShlomi Fish <shlomif@shlomifish.org>2016-10-08 15:39:06 +0000
commit2a5534a166dff8bfe6b56c8a3b496e989280fbd1 (patch)
treedbd8330a6b3dcfb201ee751dbf283a17a41a2dfa /src/sp-lpe-item.cpp
parentMerged. (diff)
parent[Bug #770681] KEY MAPPING: Comma and period hijacked by scaling. (diff)
downloadinkscape-2a5534a166dff8bfe6b56c8a3b496e989280fbd1.tar.gz
inkscape-2a5534a166dff8bfe6b56c8a3b496e989280fbd1.zip
Merged.
(bzr r15100.1.31)
Diffstat (limited to 'src/sp-lpe-item.cpp')
-rw-r--r--src/sp-lpe-item.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index d39540cd9..c4247bd5a 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
@@ -73,6 +73,7 @@ void SPLPEItem::build(SPDocument *document, Inkscape::XML::Node *repr) {
void SPLPEItem::release() {
// disconnect all modified listeners:
+
for (std::list<sigc::connection>::iterator mod_it = this->lpe_modified_connection_list->begin();
mod_it != this->lpe_modified_connection_list->end(); ++mod_it)
{
@@ -83,7 +84,7 @@ void SPLPEItem::release() {
this->lpe_modified_connection_list = NULL;
PathEffectList::iterator it = this->path_effect_list->begin();
-
+
while ( it != this->path_effect_list->end() ) {
// unlink and delete all references in the list
(*it)->unlink();
@@ -121,8 +122,10 @@ void SPLPEItem::set(unsigned int key, gchar const* value) {
while ( it != this->path_effect_list->end() )
{
+ LivePathEffectObject *lpeobj = (*it)->lpeobject;
+ lpeobj->get_lpe()->doOnRemove(this);
(*it)->unlink();
- delete *it;
+ delete (*it);
it = this->path_effect_list->erase(it);
}