Merge in a number of fixes from trunk (r2065, r2066, r2067, r2068, r2069, r2074, r2075, r2076, r2078, r2079, r2081, r2083, r2084, r2085, r2089, r2090, r2100, r2110, r2117, r2118, r2119, r2120, r2128, r2132, r2133, r2134, r2137, r2138, r2139, r2140, r2142, r2150, r2152, r2153, r2154, r2155, r2158, and r2160)

1 files changed, 15 insertions, 9 deletions

diff --git a/Source/SPConnectionDelegate.m b/Source/SPConnectionDelegate.m
index 56a254fa..c69c3150 100644
--- a/Source/SPConnectionDelegate.m
+++ b/Source/SPConnectionDelegate.m
@@ -110,18 +110,24 @@
  */
 - (MCPConnectionCheck)connectionLost:(id)connection
 {
+	NSInteger connectionErrorCode = MCPConnectionCheckDisconnect;
 
-	// Display the connection error dialog and wait for the return code
-	[NSApp beginSheet:connectionErrorDialog modalForWindow:tableWindow modalDelegate:self didEndSelector:nil contextInfo:nil];
-	NSInteger connectionErrorCode = [NSApp runModalForWindow:connectionErrorDialog];
+    // Only display the reconnect dialog if the window is visible
+    if ([tableWindow isVisible]) {
 
-	[NSApp endSheet:connectionErrorDialog];
-	[connectionErrorDialog orderOut:nil];
+    	// Display the connection error dialog and wait for the return code
+    	[NSApp beginSheet:connectionErrorDialog modalForWindow:tableWindow modalDelegate:self didEndSelector:nil contextInfo:nil];
+    	connectionErrorCode = [NSApp runModalForWindow:connectionErrorDialog];
+
+    	[NSApp endSheet:connectionErrorDialog];
+    	[connectionErrorDialog orderOut:nil];
+
+    	// If 'disconnect' was selected, trigger a window close.
+    	if (connectionErrorCode == MCPConnectionCheckDisconnect) {
+    		[self performSelectorOnMainThread:@selector(closeDocumentWindowAndDisconnect) withObject:nil waitUntilDone:YES];
+    	}
+		}
 
-	// If 'disconnect' was selected, trigger a window close.
-	if (connectionErrorCode == MCPConnectionCheckDisconnect) {
-		[self performSelectorOnMainThread:@selector(closeDocumentWindowAndDisconnect) withObject:nil waitUntilDone:YES];
-	}
 
 	return connectionErrorCode;
 }