From 602f9c6600ebd89491dbe5541445ba3545cbb940 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Wed, 19 Oct 2016 16:40:29 +0200 Subject: Fix bug:1634641 crash on delete Fixed bugs: - https://launchpad.net/bugs/1634645 (bzr r15179) --- src/sp-lpe-item.cpp | 2 +- src/sp-object.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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) { -- cgit v1.2.3