aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
Diffstat (limited to 'Source')
-rw-r--r--Source/CustomQuery.m1
-rw-r--r--Source/SPPreferenceController.m4
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/CustomQuery.m b/Source/CustomQuery.m
index e620aba5..a1922f8f 100644
--- a/Source/CustomQuery.m
+++ b/Source/CustomQuery.m
@@ -2650,6 +2650,7 @@
[menu addItem:headerMenuItem];
[headerMenuItem release];
for (NSDictionary *favorite in [prefs objectForKey:SPQueryFavorites]) {
+ if (![favorite isKindOfClass:[NSDictionary class]] || ![favorite objectForKey:@"name"]) continue;
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:[NSString stringWithString:[favorite objectForKey:@"name"]] action:NULL keyEquivalent:@""];
[item setToolTip:[NSString stringWithString:[favorite objectForKey:@"query"]]];
[item setIndentationLevel:1];
diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m
index da5c03ae..38c76f9e 100644
--- a/Source/SPPreferenceController.m
+++ b/Source/SPPreferenceController.m
@@ -267,8 +267,8 @@
[prefs setObject:[NSDictionary dictionaryWithDictionary:toolbarDict] forKey:@"NSToolbar Configuration TableWindowToolbar"];
}
- // For versions prior to r1263 (~0.9.7), convert the query favorites array to an array of dictionaries
- if (recordedVersionNumber < 1263 && [prefs objectForKey:SPQueryFavorites]) {
+ // For versions prior to r1598 (~0.9.7), convert the query favorites array to an array of dictionaries
+ if (recordedVersionNumber < 1598 && [prefs objectForKey:SPQueryFavorites]) {
NSMutableArray *queryFavoritesArray = [NSMutableArray arrayWithArray:[prefs objectForKey:SPQueryFavorites]];
for (i = 0; i < [queryFavoritesArray count]; i++)