From: gouldtj <gouldtj@users.sourceforge.net>
Date: Fri, 29 Feb 2008 22:22:48 +0000 (+0000)
Subject:  r18223@shi:  ted | 2008-02-29 14:22:41 -0800
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0a8ab34b0158ed60b781ab420f23c07210798015;p=inkscape.git

 r18223@shi:  ted | 2008-02-29 14:22:41 -0800
 Fix for LP: 169066

 Makes it so that the preference dialog doesn't try to run an effect
 that doesn't exist for input/output pref dialogs.
---

diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 5a665330b..bb0a11d80 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -204,7 +204,12 @@ void
 PrefDialog::on_response (int signal) {
     if (signal == Gtk::RESPONSE_OK) {
         if (_exEnv == NULL) {
-            _effect->effect(SP_ACTIVE_DESKTOP);
+			if (_effect != NULL) {
+				_effect->effect(SP_ACTIVE_DESKTOP);
+			} else {
+				// Shutdown run()
+				return;
+			}
         } else {
             if (_exEnv->wait()) {
                 _exEnv->commit();
@@ -222,7 +227,7 @@ PrefDialog::on_response (int signal) {
         //preview_toggle();
     }
 
-    if (signal == Gtk::RESPONSE_CANCEL) {
+    if (signal == Gtk::RESPONSE_CANCEL && _effect != NULL) {
         // close the dialog
         delete this;
     }