From 9a42c6017bc2d90be9beee6e11a451738fcfbac7 Mon Sep 17 00:00:00 2001
From: Valentin Radu <valentin.radu@valinet.ro>
Date: Tue, 7 Dec 2021 17:35:06 +0200
Subject: [PATCH] Fixed #527

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43aa7fa..7d80ff0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ Tested on build 22000.348.
 * Debug builds are clearly indicated in the "About" page of "Properties"
 * Fixed solution to properly produce a debug setup program
 * Possibility to uninstall by renaming `ep_setup.exe` to `ep_uninstall.exe` and running that (.4)
+* Fixed a bug that crashed the "Properties" GUI when toggling certain settings (#527) (.6)
 
 #### Simple Window Switcher
 
diff --git a/ExplorerPatcher/GUI.c b/ExplorerPatcher/GUI.c
index 592c9ed..b887212 100644
--- a/ExplorerPatcher/GUI.c
+++ b/ExplorerPatcher/GUI.c
@@ -34,7 +34,7 @@ LSTATUS GUI_RegSetValueExW(
     DWORD      cbData
 )
 {
-    if (wcsncmp(lpValueName, L"Virtualized_" _T(EP_CLSID), 50))
+    if (!lpValueName || wcsncmp(lpValueName, L"Virtualized_" _T(EP_CLSID), 50))
     {
         return RegSetValueExW(hKey, lpValueName, 0, dwType, lpData, cbData);
     }
@@ -146,7 +146,7 @@ LSTATUS GUI_RegQueryValueExW(
     LPDWORD lpcbData
 )
 {
-    if (wcsncmp(lpValueName, L"Virtualized_" _T(EP_CLSID), 50))
+    if (!lpValueName || wcsncmp(lpValueName, L"Virtualized_" _T(EP_CLSID), 50))
     {
         return RegQueryValueExW(hKey, lpValueName, lpReserved, lpType, lpData, lpcbData);
     }
diff --git a/version.h b/version.h
index ad106f4..33e1a26 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 5
+#define VER_BUILD_LO 6
 #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.5"
-#define VER_PRODUCT_STRING VALUE "ProductVersion", "22000.348.40.5"
+#define VER_FILE_STRING VALUE "FileVersion", "22000.348.40.6"
+#define VER_PRODUCT_STRING VALUE "ProductVersion", "22000.348.40.6"