Fixed Issue #168

Choose Database popup button now reverts to current database when cancelling the "Add Database…" dialog.

1 files changed, 3 insertions, 1 deletions

diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index 78f29d24..6969e561 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -512,8 +512,10 @@ NSString *TableDocumentFavoritesControllerFavoritesDidChange = @"TableDocumentFa
 	[NSApp endSheet:databaseSheet];
 	[databaseSheet orderOut:nil];
 	
-	if (!code)
+	if (!code) {
+		(![self database]) ? [chooseDatabaseButton selectItemAtIndex:0] : [chooseDatabaseButton selectItemWithTitle:[self database]];
 		return;
+	}
 	
 	if ([[databaseNameField stringValue] isEqualToString:@""]) {
 		NSBeginAlertSheet(NSLocalizedString(@"Error", @"error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, tableWindow, self, nil, nil, nil, NSLocalizedString(@"Database must have a name.", @"message of panel when no db name is given"));