From 889628ceee537c374b1efc56dcc71d0c1984aaa4 Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 4 Apr 2018 15:06:37 +0200 Subject: [PATCH 1/2] [remove] RELEASE VERSION!!! --- pylot/RELEASE-VERSION | 1 - 1 file changed, 1 deletion(-) delete mode 100644 pylot/RELEASE-VERSION diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION deleted file mode 100644 index c687e0f2..00000000 --- a/pylot/RELEASE-VERSION +++ /dev/null @@ -1 +0,0 @@ -39f92-dirty From a201b99c2e06eae756c08f474d83f8942bfb0a72 Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 4 Apr 2018 15:16:36 +0200 Subject: [PATCH 2/2] [bugfix] closes #256, not asking for filteroptions if no filterphase --- pylot/core/util/widgets.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py index e52480c3..a7fec228 100644 --- a/pylot/core/util/widgets.py +++ b/pylot/core/util/widgets.py @@ -2093,7 +2093,10 @@ class PickDlg(QDialog): # get filter parameter for the phase to be picked filterphase = self.currentFilterPhase() - filteroptions = self.getFilterOptions(filterphase).parseFilterOptions() + if filterphase: + filteroptions = self.getFilterOptions(filterphase).parseFilterOptions() + else: + filteroptions = None # copy and filter data for earliest and latest possible picks wfdata = self.getWFData().copy().select(channel=channel)