From b844eb0e1653c806400031eda4e7e63f48c0dbcd Mon Sep 17 00:00:00 2001
From: henrypp <support@henrypp.org>
Date: Mon, 23 Sep 2019 15:12:20 +0600
Subject: [PATCH] fix refresh filters on device change

---
 src/main.cpp | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 5d13ec61..9c560376 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2848,6 +2848,21 @@ void _app_initialize ()
 	config.done_evt = CreateEventEx (nullptr, nullptr, 0, EVENT_ALL_ACCESS);
 }
 
+INT FirstDriveFromMask (DWORD unitmask)
+{
+	INT i;
+
+	for (i = 0; i < 26; ++i)
+	{
+		if (unitmask & 0x1)
+			break;
+
+		unitmask = unitmask >> 1;
+	}
+
+	return i;
+}
+
 INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 {
 	if (msg == WM_FINDMSGSTRING)
@@ -4112,16 +4127,21 @@ INT_PTR CALLBACK DlgProc (HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
 				case DBT_DEVICEARRIVAL:
 				case DBT_DEVICEREMOVECOMPLETE:
 				{
-					if (app.ConfigGet (L"IsRefreshDevices", true).AsBool () && !_wfp_isfiltersapplying ())
+					if (app.ConfigGet (L"IsRefreshDevices", true).AsBool ())
 					{
 						const PDEV_BROADCAST_HDR lbhdr = (PDEV_BROADCAST_HDR)lparam;
 
 						if (lbhdr && lbhdr->dbch_devicetype == DBT_DEVTYP_VOLUME)
 						{
+							PDEV_BROADCAST_VOLUME lpdbv = (PDEV_BROADCAST_VOLUME)lparam;
+
 							if (wparam == DBT_DEVICEARRIVAL)
 							{
 								if (_wfp_isfiltersinstalled ())
-									_app_changefilters (hwnd, true, false);
+								{
+									if (_app_isapphavedrive (FirstDriveFromMask (lpdbv->dbcv_unitmask)))
+										_app_changefilters (hwnd, true, false);
+								}
 							}
 							else if (wparam == DBT_DEVICEREMOVECOMPLETE)
 							{