From: nicholasbishop <nicholasbishop@users.sourceforge.net>
Date: Thu, 17 Jan 2008 19:21:31 +0000 (+0000)
Subject: Fixed bug in filter effects dialog; incorrect desktop was being used with multiple... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4b429c74ba983db8d5fcc0d511c574ee4d7c21a5;p=inkscape.git

Fixed bug in filter effects dialog; incorrect desktop was being used with multiple windows open.
---

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();
 }