diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-09-07 19:33:39 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-09-07 19:33:39 +0000 |
| commit | 4d621cac75ae16592e583b9b10810303aa63baaa (patch) | |
| tree | 30c3aee5f5fc8aee1f00c7de1f69e236fec52acd /src | |
| parent | meta port: formatting (diff) | |
| parent | prevent multiple simultaneous updates during undo (Bug 1348382) (diff) | |
| download | inkscape-4d621cac75ae16592e583b9b10810303aa63baaa.tar.gz inkscape-4d621cac75ae16592e583b9b10810303aa63baaa.zip | |
update to trunk (r13547)
(bzr r13506.1.73)
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/node-toolbar.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/rect-toolbar.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/node-toolbar.cpp b/src/widgets/node-toolbar.cpp index 53161857a..39e0a9be0 100644 --- a/src/widgets/node-toolbar.cpp +++ b/src/widgets/node-toolbar.cpp @@ -270,7 +270,7 @@ static void sp_node_path_value_changed(GtkAdjustment *adj, GObject *tbl, Geom::D } // quit if run by the attr_changed listener - if (g_object_get_data( tbl, "freeze" )) { + if (g_object_get_data( tbl, "freeze" ) || tracker->isUpdating()) { return; } diff --git a/src/widgets/rect-toolbar.cpp b/src/widgets/rect-toolbar.cpp index 6996786e3..908e6cc78 100644 --- a/src/widgets/rect-toolbar.cpp +++ b/src/widgets/rect-toolbar.cpp @@ -95,7 +95,7 @@ static void sp_rtb_value_changed(GtkAdjustment *adj, GObject *tbl, gchar const * } // quit if run by the attr_changed listener - if (g_object_get_data( tbl, "freeze" )) { + if (g_object_get_data( tbl, "freeze" ) || tracker->isUpdating()) { return; } |