- fix ignored zeitraum during no filter checks

mediathekview · May 14, 2024 · fb11993 · fb11993
1 parent 00a623c
commit fb11993
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/main/java/mediathek/gui/tabs/tab_film/helpers/GuiModelHelper.java b/src/main/java/mediathek/gui/tabs/tab_film/helpers/GuiModelHelper.java
@@ -5,6 +5,7 @@
 import mediathek.gui.tabs.tab_film.SearchFieldData;
 import mediathek.javafx.filterpanel.FilmLengthSlider;
 import mediathek.javafx.filterpanel.FilterActionPanel;
+import mediathek.javafx.filterpanel.ZeitraumSpinner;
 
 import javax.swing.table.TableModel;
 import java.util.concurrent.TimeUnit;
@@ -79,7 +80,8 @@ && getFilterThema().isEmpty()
                 && !filterActionPanel.isShowBookMarkedOnly()
                 && !filterActionPanel.isDontShowTrailers()
                 && !filterActionPanel.isDontShowSignLanguage()
-                && !filterActionPanel.isDontShowAudioVersions();
+                && !filterActionPanel.isDontShowAudioVersions()
+                && filterActionPanel.zeitraumProperty().get().equalsIgnoreCase(ZeitraumSpinner.UNLIMITED_VALUE);
     }
 
     protected boolean seenCheck(DatenFilm film) {

diff --git a/src/main/java/mediathek/gui/tabs/tab_film/helpers/LuceneGuiFilmeModelHelper.java b/src/main/java/mediathek/gui/tabs/tab_film/helpers/LuceneGuiFilmeModelHelper.java
@@ -53,13 +53,6 @@ public LuceneGuiFilmeModelHelper(@NotNull FilterActionPanel filterActionPanel,
         this.searchFieldData = searchFieldData;
     }
 
-    @Override
-    protected boolean noFiltersAreSet() {
-        return super.noFiltersAreSet()
-                && filterActionPanel.zeitraumProperty().get().equalsIgnoreCase(ZeitraumSpinner.UNLIMITED_VALUE);
-    }
-
-
     private TModelFilm performTableFiltering() {
         var listeFilme = (IndexedFilmList) Daten.getInstance().getListeFilmeNachBlackList();
         try {