From 46868d049a2b4b96c50559ad8a50a4104af15c80 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Thu, 12 Sep 2013 14:16:50 -0700
Subject: fix Edit from filmstrip bug

bug:10707676
Change-Id: Idb27d36713782237a66ee2e06cafb603dc107fb4
---
 src/com/android/gallery3d/filtershow/FilterShowActivity.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 32de174dc..74c4570e5 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -935,10 +935,14 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         mShareActionProvider.setShareIntent(getDefaultShareIntent());
         mShareActionProvider.setOnShareTargetSelectedListener(this);
         mMenu = menu;
+        setupMenu();
         return true;
     }
 
     private void setupMenu(){
+        if (mMenu == null || mMasterImage == null) {
+            return;
+        }
         MenuItem undoItem = mMenu.findItem(R.id.undoButton);
         MenuItem redoItem = mMenu.findItem(R.id.redoButton);
         MenuItem resetItem = mMenu.findItem(R.id.resetHistoryButton);
-- 
cgit v1.2.3