aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2010-02-05 18:41:42 +0000
committerBibiko <bibiko@eva.mpg.de>2010-02-05 18:41:42 +0000
commit5698e7b63f0e187bb8b9d611cad4d6ec40412a4d (patch)
tree297887d2700c686db6e87e7c0d8dae86f49170dd /Source
parent843eeb2b7af11b97bdcdb9f332a9ee44dae49c0f (diff)
downloadsequelpro-5698e7b63f0e187bb8b9d611cad4d6ec40412a4d.tar.gz
sequelpro-5698e7b63f0e187bb8b9d611cad4d6ec40412a4d.tar.bz2
sequelpro-5698e7b63f0e187bb8b9d611cad4d6ec40412a4d.zip
• fixed endless loop if user selects a table whose name contains chars which are not support by the current set encoding
• added DataMigrationDialog.xib to Xcode project
Diffstat (limited to 'Source')
-rw-r--r--Source/SPTableData.m3
-rw-r--r--Source/TablesList.m5
2 files changed, 6 insertions, 2 deletions
diff --git a/Source/SPTableData.m b/Source/SPTableData.m
index 965ec042..520e0b25 100644
--- a/Source/SPTableData.m
+++ b/Source/SPTableData.m
@@ -338,7 +338,8 @@
tableName, [mySQLConnection getLastErrorMessage]]);
// If the current table doesn't exist anymore reload table list
if([mySQLConnection getLastErrorID] == 1146) {
- [tableListInstance updateTables:nil];
+ [[tableListInstance valueForKeyPath:@"tablesListView"] deselectAll:nil];
+ [tableListInstance updateTables:self];
}
}
diff --git a/Source/TablesList.m b/Source/TablesList.m
index a81c6d75..2a9a7657 100644
--- a/Source/TablesList.m
+++ b/Source/TablesList.m
@@ -221,7 +221,10 @@
[tablesListView reloadData];
// if the previous selected table still exists, select it
- if( previousSelectedTable != nil && [tables indexOfObject:previousSelectedTable] < [tables count]) {
+ // but not if the update was called from SPTableData since it calls that method
+ // if a selected table doesn't exist - this happens if a table was deleted/renamed by an other user
+ // or if the table name contains characters which are not supported by the current set encoding
+ if( ![sender isKindOfClass:[SPTableData class]] && previousSelectedTable != nil && [tables indexOfObject:previousSelectedTable] < [tables count]) {
NSInteger itemToReselect = [tables indexOfObject:previousSelectedTable];
tableListIsSelectable = YES;
[tablesListView selectRowIndexes:[NSIndexSet indexSetWithIndex:itemToReselect] byExtendingSelection:NO];