diff --git a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/SecurityListView.java b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/SecurityListView.java index a3f9edcb4e..f096ebed61 100644 --- a/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/SecurityListView.java +++ b/name.abuchen.portfolio.ui/src/name/abuchen/portfolio/ui/views/SecurityListView.java @@ -187,7 +187,12 @@ public FilterDropDown(IPreferenceStore preferenceStore) super(Messages.SecurityListFilter, Images.FILTER_OFF, SWT.NONE); setMenuListener(this); - int savedFilters = preferenceStore.getInt(this.getClass().getSimpleName() + "-filterSettings"); //$NON-NLS-1$ + int savedFilters; + if (watchlist != null) + savedFilters = preferenceStore.getInt(this.getClass().getSimpleName() + "-filterSettings" + "-" + watchlist.getName()); //$NON-NLS-1$ //$NON-NLS-2$ + else + savedFilters = preferenceStore.getInt(this.getClass().getSimpleName() + "-filterSettings"); //$NON-NLS-1$ + if ((savedFilters & (1 << 1)) != 0) filter.add(securityIsNotInactive); @@ -202,7 +207,7 @@ public FilterDropDown(IPreferenceStore preferenceStore) if (!filter.isEmpty()) setImage(Images.FILTER_ON); - + addDisposeListener(e -> { int savedFilter = 0; @@ -216,8 +221,10 @@ public FilterDropDown(IPreferenceStore preferenceStore) savedFilter += (1 << 4); if (filter.contains(sharesEqualZero)) savedFilter += (1 << 5); - - preferenceStore.setValue(this.getClass().getSimpleName() + "-filterSettings", savedFilter); //$NON-NLS-1$ + if (watchlist != null) + preferenceStore.setValue(this.getClass().getSimpleName() + "-filterSettings" + "-" + watchlist.getName(), savedFilter); //$NON-NLS-1$ //$NON-NLS-2$ + else + preferenceStore.setValue(this.getClass().getSimpleName() + "-filterSettings", savedFilter); //$NON-NLS-1$ }); }