From 169c4b2e2b68d97be404b8960ba04194db6ebcb4 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 31 Aug 2016 10:21:32 +0200 Subject: [client] Reset filter when hiding lecture list if filtered by linked image Fixes #2849 --- .../main/java/org/openslx/dozmod/gui/window/LectureListWindow.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'dozentenmodul/src/main/java') diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java index 6a6a99c3..01fb26a3 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureListWindow.java @@ -8,8 +8,6 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.regex.Pattern; @@ -51,8 +49,8 @@ import org.openslx.dozmod.thrift.ThriftActions.DeleteLectureCallback; import org.openslx.dozmod.thrift.cache.LectureCache; import org.openslx.dozmod.thrift.cache.UserCache; import org.openslx.util.QuickTimer; -import org.openslx.util.Util; import org.openslx.util.QuickTimer.Task; +import org.openslx.util.Util; /** * Window for displaying a table with the available lectures. @@ -474,6 +472,9 @@ public class LectureListWindow extends LectureListWindowLayout { @Override public boolean requestHide() { + if (cboFilter.getSelectedIndex() == -1) { + cboFilter.setSelectedIndex(0); + } return true; } -- cgit v1.2.3-55-g7522