From 82cdb7bf23b0a9f2f26acd141dce7012bd8c70d5 Mon Sep 17 00:00:00 2001
From: Owen Lin <owenlin@google.com>
Date: Fri, 17 Aug 2012 15:28:22 +0800
Subject: Fix NPE when view a single photo.

bug: 6995776
Change-Id: Iba213dfefcab04f2c856f55dc3446e3314f30a6f
---
 src/com/android/gallery3d/actionbar/SystemActionBarWrapper.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/gallery3d/actionbar/SystemActionBarWrapper.java b/src/com/android/gallery3d/actionbar/SystemActionBarWrapper.java
index 3c4dac5ae..2d70aa609 100644
--- a/src/com/android/gallery3d/actionbar/SystemActionBarWrapper.java
+++ b/src/com/android/gallery3d/actionbar/SystemActionBarWrapper.java
@@ -169,18 +169,21 @@ public class SystemActionBarWrapper implements ActionBarInterface {
 
     @Override
     public void setMenuItemVisible(int menuItemId, boolean visible) {
+        if (mMenu == null) return;
         MenuItem item = mMenu.findItem(menuItemId);
         if (item != null) item.setVisible(visible);
     }
 
     @Override
     public void setMenuItemTitle(int menuItemId, String title) {
+        if (mMenu == null) return;
         MenuItem item = mMenu.findItem(menuItemId);
         if (item != null) item.setTitle(title);
     }
 
     @Override
     public void setMenuItemIntent(int menuItemId, Intent intent) {
+        if (mMenu == null) return;
         MenuItem item = mMenu.findItem(menuItemId);
         if (item != null) item.setIntent(intent);
     }
-- 
cgit v1.2.3