From 17c95282e506c740bb5ac430d87c8021af5fd035 Mon Sep 17 00:00:00 2001
From: Jaex <Jaex@users.noreply.github.com>
Date: Mon, 26 Jul 2021 03:18:50 +0300
Subject: [PATCH] Improve reset filters logic

---
 ShareX.HistoryLib/Forms/HistoryForm.cs | 27 +++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/ShareX.HistoryLib/Forms/HistoryForm.cs b/ShareX.HistoryLib/Forms/HistoryForm.cs
index 166e3c353..fdce2954d 100644
--- a/ShareX.HistoryLib/Forms/HistoryForm.cs
+++ b/ShareX.HistoryLib/Forms/HistoryForm.cs
@@ -82,6 +82,23 @@ public HistoryForm(string historyPath, HistorySettings settings, Action<string>
             Settings.WindowState.AutoHandleFormState(this);
         }
 
+        private void ResetFilters()
+        {
+            tstbSearch.Text = "";
+            txtFilenameFilter.ResetText();
+            txtURLFilter.ResetText();
+            cbDateFilter.Checked = false;
+            dtpFilterFrom.ResetText();
+            dtpFilterTo.ResetText();
+            cbTypeFilter.Checked = false;
+            if (cbTypeFilterSelection.Items.Count > 0)
+            {
+                cbTypeFilterSelection.SelectedIndex = 0;
+            }
+            cbHostFilter.Checked = false;
+            cbHostFilterSelection.ResetText();
+        }
+
         private void RefreshHistoryItems(bool mockData = false)
         {
             allHistoryItems = GetHistoryItems(mockData);
@@ -325,14 +342,9 @@ private void HistoryForm_Shown(object sender, EventArgs e)
             {
                 cbTypeFilterSelection.Items.Clear();
                 cbTypeFilterSelection.Items.AddRange(allHistoryItems.Select(x => x.Type).Distinct().Where(x => !string.IsNullOrEmpty(x)).ToArray());
-
-                if (cbTypeFilterSelection.Items.Count > 0)
-                {
-                    cbTypeFilterSelection.SelectedIndex = 0;
-                }
-
                 cbHostFilterSelection.Items.Clear();
                 cbHostFilterSelection.Items.AddRange(allHistoryItems.Select(x => x.Host).Distinct().Where(x => !string.IsNullOrEmpty(x)).ToArray());
+                ResetFilters();
             }
 
             this.ForceActivate();
@@ -432,7 +444,8 @@ private void btnAdvancedSearch_Click(object sender, EventArgs e)
 
         private void btnAdvancedSearchReset_Click(object sender, EventArgs e)
         {
-            AddHistoryItems(allHistoryItems);
+            ResetFilters();
+            ApplyFilterAdvanced();
         }
 
         private void lvHistory_ItemSelectionChanged(object sender, ListViewItemSelectionChangedEventArgs e)