• field mapping sheet is now document-modal instead of blocking SP entirely

• if an error occurred while retrieving column or index data in Structure pane reset Structure pane to a stable status, display the error message, and reload Tables List table due to the fact the it's very likely that SP tries to retrieve data from a table which doesn't exist anymore
• fixed spelling of "occurred"

Note: NOT YET DONE: if in Structure view the actual underlying table was deleted or renamed by an other mysql event and the user tries to add/change a field do suppress this attempt safely  

1 files changed, 24 insertions, 9 deletions

diff --git a/Source/TableDump.m b/Source/TableDump.m
index 15a8c344..b6f71c2c 100644
--- a/Source/TableDump.m
+++ b/Source/TableDump.m
@@ -103,6 +103,15 @@
 	[exportMultipleXMLTableView reloadData];
 }
 
+- (IBAction)closeFieldMapperSheet:(id)sender
+{
+
+	[NSApp endSheet:fieldMappingSheet returnCode:[sender tag]];
+	// [[self window] orderOut:self];
+	// 
+	//     [NSApp endSheet:fieldMappingSheet];
+}
+
 /**
  * Common method for ending modal sessions
  */
@@ -1190,23 +1199,29 @@
 	// Trigger a table selection and setup
 	[self changeTable:self];
 
+	fieldMapperSheetStatus = 1;
+
 	// Show fieldMapping sheet
 	[NSApp beginSheet:fieldMappingSheet
 	   modalForWindow:tableWindow
 		modalDelegate:self
-	   didEndSelector:nil
+	   didEndSelector:@selector(fieldMapperDidEndSheet:returnCode:contextInfo:)
 		  contextInfo:nil];
 
-	NSInteger code = [NSApp runModalForWindow:fieldMappingSheet];
-	[NSApp endSheet:fieldMappingSheet];
-	[fieldMappingSheet orderOut:nil];
+	// Wait for fieldMappingSheet
+	while (fieldMapperSheetStatus == 1)
+		usleep(100000);
 
-	// Return success or failure based on confirmation or cancellation
-	if (code) {
-		return TRUE;
-	} else {
+	if(fieldMapperSheetStatus == 2)
+		return YES;
+	else
 		return FALSE;
-	}
+
+}
+- (void)fieldMapperDidEndSheet:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
+{
+	[sheet orderOut:self];
+	fieldMapperSheetStatus = (returnCode) ? 2 : 3;
 }
 
 /*