From 9eb37145df8adfb0bd68e9023342f5c7a4d12d31 Mon Sep 17 00:00:00 2001
From: John Hoford <hoford@google.com>
Date: Mon, 20 May 2013 18:24:12 -0700
Subject: fix TinyPlanets Filter landscape crash

bug:9038163
Change-Id: Ice1e01dfa0e9ac72e5019fac900e76bd38955e05
---
 src/com/android/gallery3d/filtershow/FilterShowActivity.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/com')

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index d13d261a8..e5ddbf5da 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -433,6 +433,9 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
     }
 
     public void showRepresentation(FilterRepresentation representation) {
+        if (representation == null) {
+            return;
+        }
         useFilterRepresentation(representation);
 
         // show representation
@@ -817,7 +820,8 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL
         loadXML();
         loadMainPanel();
 
-        if (!mShowingTinyPlanet) {
+        // mLoadBitmapTask==null implies you have looked at the intent
+        if (!mShowingTinyPlanet && (mLoadBitmapTask == null)) {
             mCategoryFiltersAdapter.removeTinyPlanet();
         }
         final View loading = findViewById(R.id.loading);
-- 
cgit v1.2.3