Merge "fix showing wrong image post save" into gb-ub-photos-carlsbad

diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
index 7b8f1b3..4322ed7 100644 (file)
--- a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
@@ -388,7 +388,7 @@ public class ImagePreset {
                 if (current.getFilterType() == FilterRepresentation.TYPE_FX) {
                     mFilters.remove(i);
                     replaced = true;
-                    if (!isNoneBorderFilter(representation)) {
+                    if (!isNoneFxFilter(representation)) {
                         mFilters.add(i, representation);
                     }
                     break;