• made usage of SPBeginWaitingAlertSheet while closing a spf file for readability of that spf file

• suppress if a window with one tab will be closed that [... parentTabShouldClose] method will be called twice via closeTab:
- this issue could be the reason for recent crashes/exception esp. of the NSNavigator (should be investigated further)

1 files changed, 8 insertions, 4 deletions

diff --git a/Source/SPWindowController.m b/Source/SPWindowController.m
index 65c1c330..33a5ae74 100644
--- a/Source/SPWindowController.m
+++ b/Source/SPWindowController.m
@@ -596,10 +596,14 @@
  */
 - (BOOL)windowShouldClose:(id)sender
 {
-	for (NSTabViewItem *eachItem in [tabView tabViewItems]) {
-		SPDatabaseDocument *eachDocument = [eachItem identifier];
-		if (![eachDocument parentTabShouldClose]) return NO;
-	}
+
+	// Iterate through all tabs if more than one tab is opened only otherwise
+	// [... parentTabShouldClose] will be called twice [see self closeTab:(id)sender]
+	if([[tabView tabViewItems] count] > 1)
+		for (NSTabViewItem *eachItem in [tabView tabViewItems]) {
+			SPDatabaseDocument *eachDocument = [eachItem identifier];
+			if (![eachDocument parentTabShouldClose]) return NO;
+		}
 
 	// Remove global session data if the last window of a session will be closed
 	if([[NSApp delegate] sessionURL] && [[[NSApp delegate] orderedDatabaseConnectionWindows] count] == 1) {