From deffe08d1bc52160c61b306eb43e98e07560eb78 Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Fri, 15 Feb 2013 15:27:54 +0100 Subject: [PATCH] Fix new selected item after delete --- Frameworks/OakFileBrowser/src/OakFileBrowser.mm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm index 2f72a8f4..249ec673 100644 --- a/Frameworks/OakFileBrowser/src/OakFileBrowser.mm +++ b/Frameworks/OakFileBrowser/src/OakFileBrowser.mm @@ -684,7 +684,7 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot ++rowToSelect; if(rowToSelect == [_outlineView numberOfRows]) - do { --rowToSelect; } while(rowToSelect > 0 && [indexSet containsIndex:rowToSelect] && ![self canSelectRow:rowToSelect]); + do { --rowToSelect; } while(rowToSelect > 0 && ([indexSet containsIndex:rowToSelect]) || ![self canSelectRow:rowToSelect]); FSItem* itemToSelect = [indexSet containsIndex:rowToSelect] ? nil : [_outlineView itemAtRow:rowToSelect]; @@ -694,7 +694,8 @@ static NSMutableSet* SymmetricDifference (NSMutableSet* aSet, NSMutableSet* anot [[OakFileManager sharedInstance] trashItemAtURL:url window:_view.window]; } - [_outlineViewDelegate selectURLs:@[ itemToSelect.url ] expandChildren:NO]; + if(itemToSelect) + [_outlineViewDelegate selectURLs:@[ itemToSelect.url ] expandChildren:NO]; } - (void)changeColor:(OakFinderLabelChooser*)labelChooser