summaryrefslogtreecommitdiffstats
path: root/src/ui
diff options
context:
space:
mode:
authorMarkus Engel <markus.engel@tum.de>2013-08-04 13:19:52 +0000
committerMarkus Engel <markus.engel@tum.de>2013-08-04 13:19:52 +0000
commitc87f9bac5947a51cac43d3487c76aac005d81af8 (patch)
treee4ee49c51388a490fa9cf789df32f2a97ef49e58 /src/ui
parentCleaned up once more. (diff)
parentcatch exception by reference (diff)
downloadinkscape-c87f9bac5947a51cac43d3487c76aac005d81af8.tar.gz
inkscape-c87f9bac5947a51cac43d3487c76aac005d81af8.zip
Merged from trunk (r12465).
(bzr r11608.1.119)
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/dialog/livepatheffect-editor.cpp6
-rw-r--r--src/ui/widget/registered-widget.h1
2 files changed, 4 insertions, 3 deletions
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index e6bb9b43d..6c6f3a582 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -448,9 +448,9 @@ LivePathEffectEditor::onAdd()
// run sp_selection_clone_original_path_lpe
sp_selection_clone_original_path_lpe(current_desktop);
- item = sel->singleItem();
- item->getRepr()->setAttribute("id", id);
- item->getRepr()->setAttribute("transform", transform);
+ SPItem *new_item = sel->singleItem();
+ new_item->getRepr()->setAttribute("id", id);
+ new_item->getRepr()->setAttribute("transform", transform);
g_free(id);
g_free(transform);
diff --git a/src/ui/widget/registered-widget.h b/src/ui/widget/registered-widget.h
index fa35b815e..18a84ea05 100644
--- a/src/ui/widget/registered-widget.h
+++ b/src/ui/widget/registered-widget.h
@@ -128,6 +128,7 @@ private:
repr = NULL;
doc = NULL;
write_undo = false;
+ event_type = -1;
}
};