fixes bug:1492711 in bspline and fillet chamfer

Fixed bugs:
  - https://launchpad.net/bugs/1492711

(bzr r14356)

2 files changed, 9 insertions, 12 deletions

diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index 64464f200..98aab287f 100644
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -11,7 +11,6 @@
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "xml/repr.h"
-#include "document-undo.h"
 
 #include "svg/stringstream.h"
 
@@ -65,13 +64,13 @@ ScalarParam::ScalarParam( const Glib::ustring& label, const Glib::ustring& tip,
       digits(2),
       inc_step(0.1),
       inc_page(1),
-      add_slider(false)
+      add_slider(false),
+      overwrite_widget(false)
 {
 }
 
 ScalarParam::~ScalarParam()
 {
-    _value_changed_connection.disconnect();
 }
 
 bool
@@ -146,10 +145,9 @@ ScalarParam::param_make_integer(bool yes)
 }
 
 void
-ScalarParam::on_value_changed()
+ScalarParam::param_overwrite_widget(bool overwrite_widget)
 {
-    DocumentUndo::done(param_effect->getSPDoc(), SP_VERB_DIALOG_LIVE_PATH_EFFECT,
-        _("Change scalar parameter"));
+    this->overwrite_widget = overwrite_widget;
 }
 
 Gtk::Widget *
@@ -166,9 +164,9 @@ ScalarParam::param_newWidget()
     if (add_slider) {
         rsu->addSlider();
     }
-
-    rsu->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change scalar parameter"));
-    _value_changed_connection = rsu->signal_value_changed().connect (sigc::mem_fun (*this, &ScalarParam::on_value_changed));
+    if(!overwrite_widget){
+        rsu->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change scalar parameter"));
+    }
     return dynamic_cast<Gtk::Widget *> (rsu);
 }
 
diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h
index c24033c42..8cda42a8e 100644
--- a/src/live_effects/parameter/parameter.h
+++ b/src/live_effects/parameter/parameter.h
@@ -12,7 +12,6 @@
 #include <glibmm/ustring.h>
 #include <2geom/forward.h>
 #include <2geom/pathvector.h>
-#include <sigc++/sigc++.h>
 
 // In gtk2, this wasn't an issue; we could toss around
 // G_MAXDOUBLE and not worry about size allocations. But
@@ -112,19 +111,18 @@ public:
     virtual void param_set_default();
     void param_set_value(gdouble val);
     void param_make_integer(bool yes = true);
-    void on_value_changed();
     void param_set_range(gdouble min, gdouble max);
     void param_set_digits(unsigned digits);
     void param_set_increments(double step, double page);
 
     void addSlider(bool add_slider_widget) { add_slider = add_slider_widget; };
 
+    void param_overwrite_widget(bool overwrite_widget);
     virtual Gtk::Widget * param_newWidget();
 
     inline operator gdouble() const { return value; };
 
 protected:
-    sigc::connection  _value_changed_connection;
     gdouble value;
     gdouble min;
     gdouble max;
@@ -134,6 +132,7 @@ protected:
     double inc_step;
     double inc_page;
     bool add_slider;
+    bool overwrite_widget;
 
 private:
     ScalarParam(const ScalarParam&);