From 8382d99dee5f2e60cc8a59f144db53db848c6e97 Mon Sep 17 00:00:00 2001
From: Leon Scroggins <scroggo@google.com>
Date: Wed, 19 Aug 2009 11:25:14 -0400
Subject: Fix a crash.

When the bookmarks page is opened to create a shortcut, there is
no menu.  So do not modify it.
---
 src/com/android/browser/BrowserBookmarksPage.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/com/android/browser/BrowserBookmarksPage.java')

diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index c97cc00..cf2dbc0 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -441,9 +441,10 @@ public class BrowserBookmarksPage extends Activity implements
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        if (mBookmarksAdapter.getCount() == 0) {
+        boolean result = super.onPrepareOptionsMenu(menu);
+        if (mCreateShortcut || mBookmarksAdapter.getCount() == 0) {
             // No need to show the menu if there are no items.
-            return false;
+            return result;
         }
         menu.findItem(R.id.switch_mode_menu_id).setTitle(
                 mGridMode ? R.string.switch_to_list
-- 
cgit v1.1