From 1a93949c18aca9b037cda25ab350a80efbb59acd Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Wed, 23 Feb 2011 02:17:36 +0000 Subject: - Improve filter dropdown comparison memory to no longer override filters to restore for foreighn keys/history navigation, improving on r3193 --- Source/SPTableContent.m | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Source') diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index a0b184dd..a127e51d 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -2382,9 +2382,12 @@ [menu addItem:item]; [item release]; - // Attempt to reselect the previously selected title, falling back to the first item - [compareField selectItemWithTitle:titleToRestore]; - if (![compareField selectedItem]) [compareField selectItemAtIndex:0]; + // Attempt to reselect the previously selected title, falling back to the first + // item on failure, as long as there is no filter selection to be restored. + if (!filterFieldToRestore) { + [compareField selectItemWithTitle:titleToRestore]; + if (![compareField selectedItem]) [compareField selectItemAtIndex:0]; + } // Update the argumentField enabled state [self performSelectorOnMainThread:@selector(toggleFilterField:) withObject:self waitUntilDone:YES]; -- cgit v1.2.3