summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/pipeline
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-10-21 13:52:10 -0700
committernicolasroard <nicolasroard@google.com>2013-10-21 13:52:10 -0700
commit5a1d760b60040a8a47d876a9accd27f0bc7be455 (patch)
tree79a98104030b1774425f5a19608390a93269e2d4 /src/com/android/gallery3d/filtershow/pipeline
parent97ad2bdcb39c0484dafb08f4a7f45bcd1a3f4f9d (diff)
downloadandroid_packages_apps_Gallery2-5a1d760b60040a8a47d876a9accd27f0bc7be455.tar.gz
android_packages_apps_Gallery2-5a1d760b60040a8a47d876a9accd27f0bc7be455.tar.bz2
android_packages_apps_Gallery2-5a1d760b60040a8a47d876a9accd27f0bc7be455.zip
Fix crash when exporting with null fx
bug:11281209 Change-Id: I71837bcb18b75201542309f71f99ba7abfb65f93
Diffstat (limited to 'src/com/android/gallery3d/filtershow/pipeline')
-rw-r--r--src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
index 4322ed700..4765a5990 100644
--- a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
@@ -394,7 +394,7 @@ public class ImagePreset {
break;
}
}
- if (!replaced) {
+ if (!replaced && !isNoneFxFilter(representation)) {
mFilters.add(0, representation);
}
} else {