From: gouldtj <gouldtj@users.sourceforge.net>
Date: Sat, 1 Sep 2007 04:38:03 +0000 (+0000)
Subject:  r16474@tres:  ted | 2007-08-31 21:37:33 -0700
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=54c7f91819ab1bb09ca4bfc0c82af971e437a129;p=inkscape.git

 r16474@tres:  ted | 2007-08-31 21:37:33 -0700
 Changes that SVK borked.
---

diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index 4134b71aa..3e7bb7e27 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -36,6 +36,7 @@ ExecutionEnv::ExecutionEnv (Effect * effect, Inkscape::UI::View::View * doc, Gtk
     _canceled(false),
     _prefsChanged(false),
     _livePreview(true),
+    _shutdown(false),
     _selfdelete(false),
     _changeSignal(changeSignal),
     _doc(doc),
@@ -67,6 +68,7 @@ ExecutionEnv::ExecutionEnv (Effect * effect, Inkscape::UI::View::View * doc, Gtk
     } else {
         _visibleDialog = prefDialog;
         _prefsVisible = true;
+        _dialogsig = _visibleDialog->signal_response().connect(sigc::mem_fun(this, &ExecutionEnv::preferencesResponse));
 
         // We came from a dialog, we'll need to die by ourselves.
         _selfdelete = true;
@@ -119,7 +121,6 @@ ExecutionEnv::preferencesTimer (void) {
 void
 ExecutionEnv::createPrefsDialog (Gtk::Widget * controls) {
     _visibleDialog = new PrefDialog(_effect->get_name(), _effect->get_help(), controls, this, _effect, _changeSignal);
-    _visibleDialog->signal_response().connect(sigc::mem_fun(this, &ExecutionEnv::preferencesResponse));
     _visibleDialog->show();
     _dialogsig = _visibleDialog->signal_response().connect(sigc::mem_fun(this, &ExecutionEnv::preferencesResponse));
 
@@ -286,8 +287,7 @@ ExecutionEnv::shutdown (bool del) {
     documentCancel();
 
     _finished = true;
-    _visibleDialog = NULL;
-}
+    _shutdown = true;
     _selfdelete = del;
 
     return;
diff --git a/src/extension/execution-env.h b/src/extension/execution-env.h
index 34b368afa..a6c4ebf64 100644
--- a/src/extension/execution-env.h
+++ b/src/extension/execution-env.h
@@ -32,6 +32,7 @@ private:
     bool _canceled;
     bool _prefsChanged;
     bool _livePreview;
+    bool _shutdown;
     bool _selfdelete;
     sigc::signal<void> * _changeSignal;
     Glib::RefPtr<Glib::MainLoop> _mainloop;
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 0174fd585..3247224eb 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -217,8 +217,7 @@ PrefDialog::on_response (int signal) {
         delete this;
     }
 
-    this->hide();
-    delete this;
+    return;
 }
 
 #include "internal/clear-n_.h"