From 9d00181c4e386ba6564cdb5ea671209855099e6f Mon Sep 17 00:00:00 2001
From: Valentin Radu <valentin.radu@valinet.ro>
Date: Sat, 11 Dec 2021 18:45:53 +0200
Subject: [PATCH] Fixed #548

---
 CHANGELOG.md              | 1 +
 ExplorerPatcher/dllmain.c | 9 ++++++++-
 version.h                 | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fd55ee..7b1165e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ Tested on build 22000.348.
 * Reliability improvements for File Explorer restarts (#529) (.7)
 * When changing the main taskbar position and restarting File Explorer, the new position is now correctly saved and applied when File Explorer restarts (#523) (.7)
 * Mitigation for the issue described in #416 (.7)
+* Fixed a bug that prevented the Windows 10 window switcher from displaying when it was enabled, instead falling back to the Windows NT window switcher (#548) (.8)
 
 #### Simple Window Switcher
 
diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
index da65c39..81df829 100644
--- a/ExplorerPatcher/dllmain.c
+++ b/ExplorerPatcher/dllmain.c
@@ -4985,7 +4985,14 @@ LSTATUS twinuipcshell_RegGetValueW(
     {
         if (lRes == ERROR_SUCCESS && *(DWORD*)pvData)
         {
-            *(DWORD*)pvData = 1;
+            if (*(DWORD*)pvData == 3)
+            {
+                *(DWORD*)pvData = 0;
+            }
+            else
+            {
+                *(DWORD*)pvData = 1;
+            }
         }
 
         if (!bOldTaskbar && hWin11AltTabInitialized)
diff --git a/version.h b/version.h
index 280377c..4dc5a7e 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define VER_MAJOR 22000
 #define VER_MINOR 348
 #define VER_BUILD_HI    40
-#define VER_BUILD_LO 7
+#define VER_BUILD_LO 8
 #define VER_FLAGS   VS_FF_PRERELEASE
 
 
@@ -12,5 +12,5 @@
 #define VER_STR(arg) #arg
 
 // The String form of the version numbers
-#define VER_FILE_STRING VALUE "FileVersion", "22000.348.40.7"
-#define VER_PRODUCT_STRING VALUE "ProductVersion", "22000.348.40.7"
+#define VER_FILE_STRING VALUE "FileVersion", "22000.348.40.8"
+#define VER_PRODUCT_STRING VALUE "ProductVersion", "22000.348.40.8"