summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2018-09-29 18:15:46 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2018-09-29 18:15:46 +0000
commitfe81dc9e303d5a499248cc409180b1bfe6583c67 (patch)
tree8a29985ce782e8ee04090489f2b5bf91b1daadd7 /src
parentCI/AppVeyor: 32-bit got left behind... (diff)
downloadinkscape-fe81dc9e303d5a499248cc409180b1bfe6583c67.tar.gz
inkscape-fe81dc9e303d5a499248cc409180b1bfe6583c67.zip
Fix bug: #1644805
LPE Parallel crashes Inkscape with Text converted to Path
Diffstat (limited to 'src')
-rw-r--r--src/live_effects/lpe-parallel.cpp6
-rwxr-xr-xsrc/object/sp-lpe-item.cpp1
2 files changed, 6 insertions, 1 deletions
diff --git a/src/live_effects/lpe-parallel.cpp b/src/live_effects/lpe-parallel.cpp
index e927d758f..f136d19ba 100644
--- a/src/live_effects/lpe-parallel.cpp
+++ b/src/live_effects/lpe-parallel.cpp
@@ -62,6 +62,12 @@ LPEParallel::~LPEParallel()
void
LPEParallel::doOnApply (SPLPEItem const* lpeitem)
{
+ if (!SP_IS_SHAPE(lpeitem)) {
+ g_warning("LPE parallel can only be applied to shapes (not groups).");
+ SPLPEItem * item = const_cast<SPLPEItem*>(lpeitem);
+ item->removeCurrentPathEffect(false);
+ return;
+ }
SPCurve const *curve = SP_SHAPE(lpeitem)->_curve;
A = *(curve->first_point());
diff --git a/src/object/sp-lpe-item.cpp b/src/object/sp-lpe-item.cpp
index 6200034ed..fef2a299b 100755
--- a/src/object/sp-lpe-item.cpp
+++ b/src/object/sp-lpe-item.cpp
@@ -605,7 +605,6 @@ void SPLPEItem::removeCurrentPathEffect(bool keep_paths)
effect_->keep_paths = keep_paths;
effect_->doOnRemove(this);
this->path_effect_list->remove(lperef); //current lpe ref is always our 'own' pointer from the path_effect_list
- std::cout << this->path_effect_list->size() << "this->path_effect_list11111" << std::endl;
this->getRepr()->setAttribute("inkscape:path-effect", patheffectlist_svg_string(*this->path_effect_list));
if (!keep_paths) {
// Make sure that ellipse is stored as <svg:circle> or <svg:ellipse> if possible.