summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-07-02 15:33:24 -0700
committernicolasroard <nicolasroard@google.com>2013-07-02 15:33:24 -0700
commit5d24515190c1664f944b7950d1a75b0df0de2ff8 (patch)
tree47edd9e2c4b1ac33cea9c74f28f63049c7059b1b /src/com/android/gallery3d/filtershow
parentbe84355fddceb9690eef752707c42457ea251e77 (diff)
downloadandroid_packages_apps_Gallery2-5d24515190c1664f944b7950d1a75b0df0de2ff8.tar.gz
android_packages_apps_Gallery2-5d24515190c1664f944b7950d1a75b0df0de2ff8.tar.bz2
android_packages_apps_Gallery2-5d24515190c1664f944b7950d1a75b0df0de2ff8.zip
Fix crash in geometry
Change-Id: I4c9292b539643f2e2738d788dcb58f0a129254f9
Diffstat (limited to 'src/com/android/gallery3d/filtershow')
-rw-r--r--src/com/android/gallery3d/filtershow/editors/Editor.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/editors/Editor.java b/src/com/android/gallery3d/filtershow/editors/Editor.java
index 5d9755c8b..789c728a2 100644
--- a/src/com/android/gallery3d/filtershow/editors/Editor.java
+++ b/src/com/android/gallery3d/filtershow/editors/Editor.java
@@ -202,7 +202,7 @@ public class Editor implements OnSeekBarChangeListener, SwapButton.SwapButtonLis
ImagePreset preset = MasterImage.getImage().getPreset();
FilterRepresentation filterRepresentation = MasterImage.getImage().getCurrentFilterRepresentation();
mLocalRepresentation = preset.getFilterRepresentationCopyFrom(filterRepresentation);
- if (mShowParameter == SHOW_VALUE_UNDEFINED) {
+ if (mShowParameter == SHOW_VALUE_UNDEFINED && filterRepresentation != null) {
boolean show = filterRepresentation.showParameterValue();
mShowParameter = show ? SHOW_VALUE_INT : SHOW_VALUE_OFF;
}