summaryrefslogtreecommitdiffstats
path: root/src/extension/prefdialog.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2017-12-25 23:46:18 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2017-12-25 23:46:18 +0000
commit60efec48f2861fba5e02ca4fff61bfdcef33f56f (patch)
tree2dbcec0c9c8d1453c422c10a53d691203f18e965 /src/extension/prefdialog.cpp
parentFix start anchors (diff)
parentMerge about-box Gtkmm changes (diff)
downloadinkscape-60efec48f2861fba5e02ca4fff61bfdcef33f56f.tar.gz
inkscape-60efec48f2861fba5e02ca4fff61bfdcef33f56f.zip
Merge branch 'master' into powerpencilII
Diffstat (limited to 'src/extension/prefdialog.cpp')
-rw-r--r--src/extension/prefdialog.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 92ddd3050..0247e18e9 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -131,6 +131,7 @@ PrefDialog::~PrefDialog ( )
_exEnv->cancel();
delete _exEnv;
_exEnv = NULL;
+ _effect->set_execution_env(_exEnv);
}
if (_effect != NULL) {
@@ -173,6 +174,7 @@ PrefDialog::preview_toggle (void) {
set_modal(true);
if (_exEnv == NULL) {
_exEnv = new ExecutionEnv(_effect, SP_ACTIVE_DESKTOP, NULL, false, false);
+ _effect->set_execution_env(_exEnv);
_exEnv->run();
}
} else {
@@ -182,6 +184,7 @@ PrefDialog::preview_toggle (void) {
_exEnv->undo();
delete _exEnv;
_exEnv = NULL;
+ _effect->set_execution_env(_exEnv);
}
}
}
@@ -230,6 +233,7 @@ PrefDialog::on_response (int signal) {
}
delete _exEnv;
_exEnv = NULL;
+ _effect->set_execution_env(_exEnv);
}
}