summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java6
1 files changed, 5 insertions, 1 deletions
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);