Improve Disconnection on connection loss:

 - Set error strings on MCPConnection on user disconnect to allow existing error chcking to catch the state
 - Improve close behaviour from threads
 - Improve window close behaviour and appearance
 - Add new checks for disconnection in one or two crash-prone locations
This addresses Issue #531, one of Issue #532, one of Issue #539, and probable reported crashes on Issue #541.

1 files changed, 19 insertions, 14 deletions

diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index d0410044..d8d16e85 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -2236,6 +2236,7 @@
 - (void)closeConnection
 {
 	[mySQLConnection disconnect];
+	_isConnected = NO;
 
 	// Disconnected Growl notification
 	[[SPGrowlController sharedGrowlController] notifyWithTitle:@"Disconnected" 
@@ -3425,7 +3426,7 @@
 - (void)windowWillClose:(NSNotification *)aNotification
 {
 	[mySQLConnection setDelegate:nil];
-	if ([mySQLConnection isConnected]) [self closeConnection];
+	if (_isConnected) [self closeConnection];
 	if ([[[SPQueryController sharedQueryController] window] isVisible]) [self toggleConsole:self];
 	[createTableSyntaxWindow orderOut:nil];
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -3436,22 +3437,26 @@
  */
 - (BOOL)windowShouldClose:(id)sender
 {
-	if (_isWorkingLevel) {
-		return NO;
-	} else if ( ![tablesListInstance selectionShouldChangeInTableView:nil] ) {
-		return NO;
-	} else {
 
-		if(!_isConnected) return YES;
+	// If no connection is available, always return YES.  Covers initial setup and disconnections.
+	if(!_isConnected) return YES;
 
-		// Auto-save spf file based connection
-		if([self fileURL] && [[[self fileURL] absoluteString] length] && ![self isUntitled]) {
-			BOOL isSaved = [self saveDocumentWithFilePath:nil inBackground:YES onlyPreferences:YES];
-			if(isSaved)
-				[[SPQueryController sharedQueryController] removeRegisteredDocumentWithFileURL:[self fileURL]];
-			return isSaved;
-		}
+	// If tasks are active, return NO to allow tasks to complete
+	if (_isWorkingLevel) return NO;
+
+	// If the table list considers itself to be working, return NO. This catches open alerts, and
+	// edits in progress in various views.
+	if ( ![tablesListInstance selectionShouldChangeInTableView:nil] ) return NO;
+
+	// Auto-save spf file based connection and return whether the save was successful
+	if([self fileURL] && [[[self fileURL] absoluteString] length] && ![self isUntitled]) {
+		BOOL isSaved = [self saveDocumentWithFilePath:nil inBackground:YES onlyPreferences:YES];
+		if(isSaved)
+			[[SPQueryController sharedQueryController] removeRegisteredDocumentWithFileURL:[self fileURL]];
+		return isSaved;
 	}
+
+	// Return YES by default
 	return YES;
 }