diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-10-19 14:40:29 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-10-19 14:40:29 +0000 |
| commit | 602f9c6600ebd89491dbe5541445ba3545cbb940 (patch) | |
| tree | 4811ebafeb534a16e98ce64e3d2d4648a9b1862f /src | |
| parent | [Bug #1574561] Italian translation update. (diff) | |
| download | inkscape-602f9c6600ebd89491dbe5541445ba3545cbb940.tar.gz inkscape-602f9c6600ebd89491dbe5541445ba3545cbb940.zip | |
Fix bug:1634641 crash on delete
Fixed bugs:
- https://launchpad.net/bugs/1634645
(bzr r15179)
Diffstat (limited to 'src')
| -rw-r--r-- | src/sp-lpe-item.cpp | 2 | ||||
| -rw-r--r-- | src/sp-object.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp index f0b46a547..8f0713652 100644 --- a/src/sp-lpe-item.cpp +++ b/src/sp-lpe-item.cpp @@ -588,7 +588,7 @@ bool SPLPEItem::hasBrokenPathEffect() const bool SPLPEItem::hasPathEffect() const { - if (path_effect_list->empty()) { + if (!path_effect_list || path_effect_list->empty()) { return false; } diff --git a/src/sp-object.cpp b/src/sp-object.cpp index cbd7aa969..21d8bcd93 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -485,7 +485,7 @@ void SPObject::_sendDeleteSignalRecursive() { void SPObject::deleteObject(bool propagate, bool propagate_descendants) { sp_object_ref(this, NULL); - if ( SP_IS_LPE_ITEM(this) ) { + if ( SP_IS_LPE_ITEM(this) && SP_LPE_ITEM(this)->hasPathEffect()) { SP_LPE_ITEM(this)->removeAllPathEffects(false); } if (propagate) { |