Skip to content
Snippets Groups Projects
Commit 9dd00256 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#96 - fixed: filter active icon not showing if filtered by tags

parent 3decdf15
No related branches found
No related tags found
1 merge request!213merge v1_6_0 into master
...@@ -164,7 +164,7 @@ public class FilterSettings ...@@ -164,7 +164,7 @@ public class FilterSettings
} }
else else
{ {
return true; return isEqualTagIDs(otherSettings);
} }
} }
else else
...@@ -177,11 +177,17 @@ public class FilterSettings ...@@ -177,11 +177,17 @@ public class FilterSettings
{ {
if(allowedCategoryIDs.equals(otherSettings.getAllowedCategoryIDs())) if(allowedCategoryIDs.equals(otherSettings.getAllowedCategoryIDs()))
{ {
return true; return isEqualTagIDs(otherSettings);
}
}
} }
} }
return false;
} }
private boolean isEqualTagIDs(FilterSettings otherSettings)
{
if(allowedTagIDs == null) if(allowedTagIDs == null)
{ {
if(otherSettings.getAllowedTagIDs() != null) if(otherSettings.getAllowedTagIDs() != null)
...@@ -207,7 +213,6 @@ public class FilterSettings ...@@ -207,7 +213,6 @@ public class FilterSettings
} }
} }
} }
}
return false; return false;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment