summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNicholas Bishop <nicholasbishop@gmail.com>2008-01-17 19:21:31 +0000
committernicholasbishop <nicholasbishop@users.sourceforge.net>2008-01-17 19:21:31 +0000
commit82ae4ab758362f652f8ce3bb052bc6abfae6f52f (patch)
treee72790e3a19b28f55f06f9090ae89a40b21debf2 /src
parentFixed a crash on removing a filter primitive in the filter effects dialog. (diff)
downloadinkscape-82ae4ab758362f652f8ce3bb052bc6abfae6f52f.tar.gz
inkscape-82ae4ab758362f652f8ce3bb052bc6abfae6f52f.zip
Fixed bug in filter effects dialog; incorrect desktop was being used with multiple windows open.
(bzr r4536)
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/filter-effects-dialog.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 06275bf1b..2073a3ea4 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -944,8 +944,6 @@ FilterEffectsDialog::FilterModifier::~FilterModifier()
void FilterEffectsDialog::FilterModifier::on_activate_desktop(Application*, SPDesktop* desktop, FilterModifier* me)
{
- me->update_filters();
-
me->_doc_replaced.disconnect();
me->_doc_replaced = desktop->connectDocumentReplaced(
sigc::mem_fun(me, &FilterModifier::on_document_replaced));
@@ -954,6 +952,10 @@ void FilterEffectsDialog::FilterModifier::on_activate_desktop(Application*, SPDe
me->_resource_changed =
sp_document_resources_changed_connect(sp_desktop_document(desktop), "filter",
sigc::mem_fun(me, &FilterModifier::update_filters));
+
+ me->_dialog.setDesktop(desktop);
+
+ me->update_filters();
}