- Fix crashes caused by using SPBundleHTMLOutputController windows, closing them, and then triggering bundle reloads (eg via right-clicking)

1 files changed, 10 insertions, 5 deletions

diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index 4f4bab2c..5686854b 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -1515,13 +1515,19 @@ YY_BUFFER_STATE yy_scan_string (const char *);
 	[bundleHTMLOutputController addObject:controller];
 }
 
+- (void)removeHTMLOutputController:(id)controller
+{
+	[bundleHTMLOutputController removeObject:controller];
+}
+
 - (IBAction)reloadBundles:(id)sender
 {
 
-	// Force releasing of any HTML output windows
-	for(id c in bundleHTMLOutputController) {
-		if(![[c window] isVisible]) {
-			[c release];
+	// Force releasing of any hidden HTML output windows, which will automatically remove them from the array.
+	// Keep the visible windows.
+	for (id c in bundleHTMLOutputController) {
+		if (![[c window] isVisible]) {
+			[[c window] performClose:self];
 		}
 	}
 
@@ -1529,7 +1535,6 @@ YY_BUFFER_STATE yy_scan_string (const char *);
 
 	[bundleItems removeAllObjects];
 	[bundleUsedScopes removeAllObjects];
-	[bundleHTMLOutputController removeAllObjects];
 	[bundleCategories removeAllObjects];
 	[bundleTriggers removeAllObjects];
 	[bundleKeyEquivalents removeAllObjects];