Fixes for clone original LPE

2 files changed, 24 insertions, 18 deletions

diff --git a/src/live_effects/parameter/originalpatharray.cpp b/src/live_effects/parameter/originalpatharray.cpp
index 13bd23634..0b1eb4802 100644
--- a/src/live_effects/parameter/originalpatharray.cpp
+++ b/src/live_effects/parameter/originalpatharray.cpp
@@ -326,28 +326,25 @@ OriginalPathArrayParam::on_link_button_click()
     if (pathsid.empty()) {
         return;
     }
+    bool foundOne = false;
     Inkscape::SVGOStringStream os;
+    for (std::vector<PathAndDirectionAndVisible*>::const_iterator iter = _vector.begin(); iter != _vector.end(); ++iter) {
+        if (foundOne) {
+            os << "|";
+        } else {
+            foundOne = true;
+        }
+        os << (*iter)->href << "," << ((*iter)->reversed ? "1" : "0") << "," << ((*iter)->visibled ? "1" : "0");
+    }
     for (auto i=pathsid.begin();i!=pathsid.end();++i) {
         Glib::ustring pathid = *i;
         // add '#' at start to make it an uri.
         pathid.insert(pathid.begin(), '#');
-        bool foundOne = false;
-        for (std::vector<PathAndDirectionAndVisible*>::const_iterator iter = _vector.begin(); iter != _vector.end(); ++iter) {
-            if (foundOne) {
-                os << "|";
-            } else {
-                foundOne = true;
-            }
-            os << (*iter)->href << "," << ((*iter)->reversed ? "1" : "0") << "," << ((*iter)->visibled ? "1" : "0");
-        }
-        
+
         if (foundOne) {
             os << "|";
         }
-        os << pathid.c_str() << ",0";
-        if (*i != *(--pathsid.end())) {
-            os << "|";
-        }
+        os << pathid.c_str() << ",0,1";
     }
     param_write_to_repr(os.str().c_str());
     DocumentUndo::done(param_effect->getSPDoc(), SP_VERB_DIALOG_LIVE_PATH_EFFECT,
@@ -363,7 +360,7 @@ void OriginalPathArrayParam::unlink(PathAndDirectionAndVisible* to)
     if (to->href) {
         g_free(to->href);
         to->href = NULL;
-    }    
+    }
 }
 
 void OriginalPathArrayParam::remove_link(PathAndDirectionAndVisible* to)
@@ -528,6 +525,14 @@ gchar * OriginalPathArrayParam::param_getSVGValue() const
     return str;
 }
 
+void OriginalPathArrayParam::update()
+{
+    for (std::vector<PathAndDirectionAndVisible*>::iterator iter = _vector.begin(); iter != _vector.end(); ++iter) {
+        SPObject *linked_obj = (*iter)->ref.getObject();
+        linked_modified(linked_obj, SP_OBJECT_MODIFIED_FLAG, *iter);
+    }
+}
+
 } /* namespace LivePathEffect */
 
 } /* namespace Inkscape */
diff --git a/src/live_effects/parameter/originalpatharray.h b/src/live_effects/parameter/originalpatharray.h
index 51810a5cf..cffa2911f 100644
--- a/src/live_effects/parameter/originalpatharray.h
+++ b/src/live_effects/parameter/originalpatharray.h
@@ -72,11 +72,11 @@ public:
     virtual void param_editOncanvas(SPItem * /*item*/, SPDesktop * /*dt*/) {};
     /** Disable the canvas indicators of parent class by overriding this method */
     virtual void addCanvasIndicators(SPLPEItem const* /*lpeitem*/, std::vector<Geom::PathVector> & /*hp_vec*/) {};
-    void setFromOriginalD(bool from_original_d){ _from_original_d = from_original_d; };
-    void allowOnlyBsplineSpiro(bool allow_only_bspline_spiro){ _allow_only_bspline_spiro = allow_only_bspline_spiro; };
+    void setFromOriginalD(bool from_original_d){ _from_original_d = from_original_d; update();};
+    void allowOnlyBsplineSpiro(bool allow_only_bspline_spiro){ _allow_only_bspline_spiro = allow_only_bspline_spiro; update();};
 
     std::vector<PathAndDirectionAndVisible*> _vector;
-    
+
 protected:
     bool _updateLink(const Gtk::TreeIter& iter, PathAndDirectionAndVisible* pd);
     bool _selectIndex(const Gtk::TreeIter& iter, int* i);
@@ -108,6 +108,7 @@ protected:
 private:
     bool _from_original_d;
     bool _allow_only_bspline_spiro;
+    void update();
     OriginalPathArrayParam(const OriginalPathArrayParam&);
     OriginalPathArrayParam& operator=(const OriginalPathArrayParam&);
 };