aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2010-09-26 20:26:39 +0000
committerrowanbeentje <rowan@beent.je>2010-09-26 20:26:39 +0000
commit2281746fdc1f1a2ff93fc28fc0182614445d5938 (patch)
tree0c141ec521a84d0b436a4ee431c085c9216d8f0a
parent15a9a678170c20671e86c5fa18393e1c5bddaff4 (diff)
downloadsequelpro-2281746fdc1f1a2ff93fc28fc0182614445d5938.tar.gz
sequelpro-2281746fdc1f1a2ff93fc28fc0182614445d5938.tar.bz2
sequelpro-2281746fdc1f1a2ff93fc28fc0182614445d5938.zip
Tweak favourites sorting from r2696, fixing exceptions when no sort type is selected
-rw-r--r--Source/SPConnectionController.m4
-rw-r--r--Source/SPPreferenceController.m4
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index 6e760a9d..baa09262 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -133,8 +133,8 @@
[favoritesTable registerForDraggedTypes:[NSArray arrayWithObject:favoritesPBoardType]];
[favoritesTable setDraggingSourceOperationMask:NSDragOperationMove forLocal:YES];
- // Sort the favourites to match prefs and select the appropriate row
- [self _sortFavorites];
+ // Sort the favourites to match prefs and select the appropriate row - if a valid sort option is selected
+ if (currentSortItem > -1) [self _sortFavorites];
NSInteger tableRow = ([prefs integerForKey:[prefs boolForKey:SPSelectLastFavoriteUsed] ? SPLastFavoriteIndex : SPDefaultFavorite] + 1);
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index 4441c75d..932bed9c 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -109,8 +109,8 @@
[prefs synchronize];
- // Sort favorites
- [self _sortFavorites];
+ // Sort favorites if a sort type has been selected
+ if (currentSortItem > -1) [self _sortFavorites];
NSTableColumn *column;
SPColorWellCell *colorCell;