diff options
| author | snej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 00:43:19 +0000 |
|---|---|---|
| committer | snej@chromium.org <snej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-25 00:43:19 +0000 |
| commit | 0ce42e2abcb3360f647eb9ba41cf5406dac71c0a (patch) | |
| tree | 00e7c0a5c034f8795ddbd5f0cb695af5cc001fb7 | |
| parent | 5342662c41d6a3e06eb91a3e6e9c3fbd28728886 (diff) | |
| download | chromium_src-0ce42e2abcb3360f647eb9ba41cf5406dac71c0a.zip chromium_src-0ce42e2abcb3360f647eb9ba41cf5406dac71c0a.tar.gz chromium_src-0ce42e2abcb3360f647eb9ba41cf5406dac71c0a.tar.bz2 | |
Mac bookmark mgr: Fix an intermittent exception after right-clicking.
BUG=36334
TEST=none
Review URL: http://codereview.chromium.org/661030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39965 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/cocoa/bookmark_tree_controller.mm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/bookmark_tree_controller.mm b/chrome/browser/cocoa/bookmark_tree_controller.mm index d17305f..8bea570 100644 --- a/chrome/browser/cocoa/bookmark_tree_controller.mm +++ b/chrome/browser/cocoa/bookmark_tree_controller.mm @@ -126,9 +126,12 @@ static NSString* const kFolderColIdent = @"folder"; // Returns the selected/right-clicked item(s) for a command to act on. - (NSArray*)actionItems { int row = [outline_ clickedRow]; - if (row >= 0 && ![outline_ isRowSelected:row]) - return [NSArray arrayWithObject:[outline_ itemAtRow:row]]; - + if (row >= 0 && ![outline_ isRowSelected:row]) { + BookmarkItem* item = [outline_ itemAtRow:row]; + if (!item) + return nil; // clickedRow can occasionally return a nonexistent row + return [NSArray arrayWithObject:item]; + } return [self selectedItems]; } |