summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNicolas Dufour <nicoduf@yahoo.fr>2012-08-01 20:14:44 +0000
committerJazzyNico <nicoduf@yahoo.fr>2012-08-01 20:14:44 +0000
commit0ee2d9a5b9cbccb1187096088b76f980b5d6b4a9 (patch)
tree49091774c938d944ad198ad9ed72fe18b152026c /src
parentFix for 918894 : Remove link is reported as Ungroup in Undo history (diff)
downloadinkscape-0ee2d9a5b9cbccb1187096088b76f980b5d6b4a9.tar.gz
inkscape-0ee2d9a5b9cbccb1187096088b76f980b5d6b4a9.zip
Filters. Fix for Bug #431271 (Crash after undo/redo a (combined) filter effect).
(bzr r11581)
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/filter-effects-dialog.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index acdbfba70..fe68feca8 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -1529,8 +1529,11 @@ void FilterEffectsDialog::PrimitiveList::update()
//XML Tree being used directly here while it shouldn't be.
row[_columns.type_id] = FPConverter.get_id_from_key(prim->getRepr()->name());
row[_columns.type] = _(FPConverter.get_label(row[_columns.type_id]).c_str());
- row[_columns.id] = prim->getId();
-
+
+ if (prim->getId()) {
+ row[_columns.id] = Glib::ustring(prim->getId());
+ }
+
if(prim == active_prim) {
get_selection()->select(row);
active_found = true;