diff options
| author | rowanbeentje <rowan@beent.je> | 2011-02-23 02:17:36 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2011-02-23 02:17:36 +0000 |
| commit | 1a93949c18aca9b037cda25ab350a80efbb59acd (patch) | |
| tree | 7ea485ba62b7f9722ac15fb72e1142f138bfa31a | |
| parent | 73f0f83a2eb41874212c7165bfd535bdf607d5b0 (diff) | |
| download | sequelpro-1a93949c18aca9b037cda25ab350a80efbb59acd.tar.gz sequelpro-1a93949c18aca9b037cda25ab350a80efbb59acd.tar.bz2 sequelpro-1a93949c18aca9b037cda25ab350a80efbb59acd.zip | |
- Improve filter dropdown comparison memory to no longer override filters to restore for foreighn keys/history navigation, improving on r3193
| -rw-r--r-- | Source/SPTableContent.m | 9 |
1 files changed, 6 insertions, 3 deletions
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]; |