From 1c7b07d6143b7fe6f1e2de6532129a0d21210371 Mon Sep 17 00:00:00 2001
From: vldmr11080 <57061786+vldmr11080@users.noreply.github.com>
Date: Tue, 2 Jun 2020 12:06:36 +0200
Subject: [PATCH] Remove workarounds related to 0000 dekstop GUID. (#3931)

---
 src/modules/fancyzones/lib/JsonHelpers.cpp         | 4 ----
 src/modules/fancyzones/lib/VirtualDesktopUtils.cpp | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/src/modules/fancyzones/lib/JsonHelpers.cpp b/src/modules/fancyzones/lib/JsonHelpers.cpp
index e95e2c4ee3..094a2d9cf1 100644
--- a/src/modules/fancyzones/lib/JsonHelpers.cpp
+++ b/src/modules/fancyzones/lib/JsonHelpers.cpp
@@ -281,10 +281,6 @@ namespace JSONHelpers
     bool FancyZonesData::RemoveDevicesByVirtualDesktopId(const std::wstring& virtualDesktopId)
     {
         std::scoped_lock lock{ dataLock };
-        if (virtualDesktopId == DEFAULT_GUID)
-        {
-            return false;
-        }
         bool modified{ false };
         for (auto it = deviceInfoMap.begin(); it != deviceInfoMap.end();)
         {
diff --git a/src/modules/fancyzones/lib/VirtualDesktopUtils.cpp b/src/modules/fancyzones/lib/VirtualDesktopUtils.cpp
index c060dd47ca..1ae4d5d4ba 100644
--- a/src/modules/fancyzones/lib/VirtualDesktopUtils.cpp
+++ b/src/modules/fancyzones/lib/VirtualDesktopUtils.cpp
@@ -5,7 +5,6 @@
 namespace VirtualDesktopUtils
 {
     const CLSID CLSID_ImmersiveShell = { 0xC2F03A33, 0x21F5, 0x47FA, 0xB4, 0xBB, 0x15, 0x63, 0x62, 0xA2, 0xF2, 0x39 };
-    const wchar_t GUID_EmptyGUID[] = L"{00000000-0000-0000-0000-000000000000}";
 
     const wchar_t RegCurrentVirtualDesktop[] = L"CurrentVirtualDesktop";
     const wchar_t RegVirtualDesktopIds[] = L"VirtualDesktopIDs";
@@ -44,10 +43,6 @@ namespace VirtualDesktopUtils
         // Format: <device-id>_<resolution>_<virtual-desktop-id>
         std::wstring uniqueId = zoneWindow->UniqueId();
         std::wstring virtualDesktopId = uniqueId.substr(uniqueId.rfind('_') + 1);
-        if (virtualDesktopId == GUID_EmptyGUID)
-        {
-            return false;
-        }
         return SUCCEEDED(CLSIDFromString(virtualDesktopId.c_str(), desktopId));
     }