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 5a665330b3121e2357eb7b3839c84af748166885..bb0a11d80c7ebe09ac5da9ee1e9602440e1960af 100644 (file)
--- 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;
     }