• Bundle Commands

- make sure that each HTML output window will be released
- if a triggered command will outputs its result in an HTML window invoke it only if the HTML output window is already open; this enables the user to "switch on/off" such a trigger

1 files changed, 27 insertions, 9 deletions

diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
index 2729932f..43d71b01 100644
--- a/Source/SPDatabaseDocument.m
+++ b/Source/SPDatabaseDocument.m
@@ -5320,16 +5320,34 @@
 		NSMenuItem *aMenuItem = [[[NSMenuItem alloc] init] autorelease];
 		[aMenuItem setTag:0];
 		[aMenuItem setToolTip:[data objectAtIndex:0]];
-		if([[data objectAtIndex:1] isEqualToString:SPBundleScopeGeneral]) {
-			[[[NSApp delegate] onMainThread] executeBundleItemForApp:aMenuItem];
-		}
-		else if([[data objectAtIndex:1] isEqualToString:SPBundleScopeDataTable]) {
-			if([[[NSApp mainWindow] firstResponder] isKindOfClass:[SPCopyTable class]])
-				[[[[NSApp mainWindow] firstResponder] onMainThread] executeBundleItemForDataTable:aMenuItem];
+
+		// For HTML output check if corresponding window already exists
+		BOOL stopTrigger = NO;
+		if([[data objectAtIndex:2] length]) {
+			BOOL correspondingWindowFound = NO;
+			NSString *uuid = [data objectAtIndex:2];
+			for(id win in [NSApp windows]) {
+				if([[[[win delegate] class] description] isEqualToString:@"SPBundleHTMLOutputController"]) {
+					if([[[win delegate] windowUUID] isEqualToString:uuid]) {
+						correspondingWindowFound = YES;
+						break;
+					}
+				}
+			}
+			if(!correspondingWindowFound) stopTrigger = YES;
 		}
-		else if([[data objectAtIndex:1] isEqualToString:SPBundleScopeInputField]) {
-			if([[[NSApp mainWindow] firstResponder] isKindOfClass:[NSTextView class]])
-				[[[[NSApp mainWindow] firstResponder] onMainThread] executeBundleItemForInputField:aMenuItem];
+		if(!stopTrigger) {
+			if([[data objectAtIndex:1] isEqualToString:SPBundleScopeGeneral]) {
+				[[[NSApp delegate] onMainThread] executeBundleItemForApp:aMenuItem];
+			}
+			else if([[data objectAtIndex:1] isEqualToString:SPBundleScopeDataTable]) {
+				if([[[[[NSApp mainWindow] firstResponder] class] description] isEqualToString:@"SPCopyTable"])
+					[[[[NSApp mainWindow] firstResponder] onMainThread] executeBundleItemForDataTable:aMenuItem];
+			}
+			else if([[data objectAtIndex:1] isEqualToString:SPBundleScopeInputField]) {
+				if([[[NSApp mainWindow] firstResponder] isKindOfClass:[NSTextView class]])
+					[[[[NSApp mainWindow] firstResponder] onMainThread] executeBundleItemForInputField:aMenuItem];
+			}
 		}
 	}