diff options
| author | Ted Gould <ted@gould.cx> | 2008-02-04 17:56:01 +0000 |
|---|---|---|
| committer | gouldtj <gouldtj@users.sourceforge.net> | 2008-02-04 17:56:01 +0000 |
| commit | 2fbacff8d09593dedabac78152256ce8efec1d7c (patch) | |
| tree | e14204d5cf706d1e177223bab01d42829345aa8d /src/extension/execution-env.cpp | |
| parent | r17818@shi: ted | 2008-01-31 09:20:06 -0800 (diff) | |
| download | inkscape-2fbacff8d09593dedabac78152256ce8efec1d7c.tar.gz inkscape-2fbacff8d09593dedabac78152256ce8efec1d7c.zip | |
r17821@shi: ted | 2008-01-31 12:59:57 -0800
Okay, I'm not 100% sure what all these changes are but I want to start working on this again from a checked in point. I'll fix the bugs from here.
(bzr r4653)
Diffstat (limited to '')
| -rw-r--r-- | src/extension/execution-env.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp index ea04a8f09..a978ec7cb 100644 --- a/src/extension/execution-env.cpp +++ b/src/extension/execution-env.cpp @@ -89,7 +89,7 @@ ExecutionEnv::~ExecutionEnv (void) { if (_prefsVisible) { _changesig.disconnect(); } - if (_visibleDialog != NULL && !_shutdown) { + if (_visibleDialog != NULL && !_shutdown && !_prefsVisible) { delete _visibleDialog; } if (_changeSignal != NULL && !_shutdown) { @@ -101,7 +101,7 @@ ExecutionEnv::~ExecutionEnv (void) { void ExecutionEnv::genDocCache (void) { - if (_docCache == NULL) { +if (_docCache == NULL) { // printf("Gen Doc Cache\n"); _docCache = _effect->get_imp()->newDocCache(_effect, _doc); } @@ -178,6 +178,7 @@ ExecutionEnv::createWorkingDialog (void) { void ExecutionEnv::workingCanceled( const int /*resp*/ ) { + printf("Working Canceled\n"); processingCancel(); documentCancel(); _finished = true; |