From 2fbacff8d09593dedabac78152256ce8efec1d7c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 4 Feb 2008 17:56:01 +0000 Subject: 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) --- src/extension/execution-env.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/extension/execution-env.cpp') 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; -- cgit v1.2.3