From 065acae2c40acb767dfcb4b9f22ef43c30030c4e Mon Sep 17 00:00:00 2001
From: Valentin Radu <valentin.radu@valinet.ro>
Date: Tue, 4 Jan 2022 01:49:22 +0200
Subject: [PATCH] Protect taskbar style state variable from changing once its
 setting is read from the registry

---
 ExplorerPatcher/dllmain.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
index 0048028..7f46f33 100644
--- a/ExplorerPatcher/dllmain.c
+++ b/ExplorerPatcher/dllmain.c
@@ -47,6 +47,7 @@ BOOL bIsExplorerProcess = FALSE;
 BOOL bInstanced = FALSE;
 HWND archivehWnd;
 DWORD bOldTaskbar = TRUE;
+DWORD bWasOldTaskbarSet = FALSE;
 DWORD bAllocConsole = FALSE;
 DWORD bHideExplorerSearchBar = FALSE;
 DWORD bMicaEffectOnTitlebar = FALSE;
@@ -4152,15 +4153,21 @@ void WINAPI LoadSettings(LPARAM lParam)
             RegCloseKey(hKey);
             return;
         }
+        dwTemp = TRUE;
         dwSize = sizeof(DWORD);
         RegQueryValueExW(
             hKey,
             TEXT("OldTaskbar"),
             0,
             NULL,
-            &bOldTaskbar,
+            &dwTemp,
             &dwSize
         );
+        if (!bWasOldTaskbarSet)
+        {
+            bOldTaskbar = dwTemp;
+            bWasOldTaskbarSet = TRUE;
+        }
         dwSize = sizeof(DWORD);
         RegQueryValueExW(
             hKey,