summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
index fc83e4f8c..0fb157d7b 100644
--- a/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterRepresentation.java
@@ -271,7 +271,8 @@ public class FilterRepresentation {
}
public boolean canMergeWith(FilterRepresentation representation) {
- if (representation.getFilterType() == FilterRepresentation.TYPE_GEOMETRY) {
+ if (getFilterType() == FilterRepresentation.TYPE_GEOMETRY
+ && representation.getFilterType() == FilterRepresentation.TYPE_GEOMETRY) {
return true;
}
return false;