diff options
| author | Ted Gould <ted@gould.cx> | 2007-09-01 04:38:03 +0000 |
|---|---|---|
| committer | gouldtj <gouldtj@users.sourceforge.net> | 2007-09-01 04:38:03 +0000 |
| commit | b7c044a98e51bec4569ae02ae9f330dccc2d8329 (patch) | |
| tree | 39d97e3456c95168e1c303d25ed9777670e5e5e6 /src | |
| parent | (bzr r3655) (diff) | |
| download | inkscape-b7c044a98e51bec4569ae02ae9f330dccc2d8329.tar.gz inkscape-b7c044a98e51bec4569ae02ae9f330dccc2d8329.zip | |
r16474@tres: ted | 2007-08-31 21:37:33 -0700
Changes that SVK borked.
(bzr r3656)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/execution-env.cpp | 6 | ||||
| -rw-r--r-- | src/extension/execution-env.h | 1 | ||||
| -rw-r--r-- | src/extension/prefdialog.cpp | 3 |
3 files changed, 5 insertions, 5 deletions
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" |