diff options
| author | Ted Gould <ted@gould.cx> | 2008-02-29 22:22:48 +0000 |
|---|---|---|
| committer | gouldtj <gouldtj@users.sourceforge.net> | 2008-02-29 22:22:48 +0000 |
| commit | 84fc4b79a560750627ef1247cfb2c2f8b856a21d (patch) | |
| tree | 48d04aee645ec0df5900d3f0e1af903ad1f2df0f /src/extension/prefdialog.cpp | |
| parent | r18220@shi: ted | 2008-02-29 13:18:55 -0800 (diff) | |
| download | inkscape-84fc4b79a560750627ef1247cfb2c2f8b856a21d.tar.gz inkscape-84fc4b79a560750627ef1247cfb2c2f8b856a21d.zip | |
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.
(bzr r4909)
Diffstat (limited to 'src/extension/prefdialog.cpp')
| -rw-r--r-- | src/extension/prefdialog.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
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; } |