From 6556e1b4a2baedb1000dc17a14e546ed74f32bcf Mon Sep 17 00:00:00 2001
From: vldmr11080 <57061786+vldmr11080@users.noreply.github.com>
Date: Mon, 2 Mar 2020 18:52:38 +0100
Subject: [PATCH] Skip cloning device information from parent virtual desktop
 if it is deleted. (#1415)

---
 src/modules/fancyzones/lib/JsonHelpers.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/modules/fancyzones/lib/JsonHelpers.cpp b/src/modules/fancyzones/lib/JsonHelpers.cpp
index 603a79a106..b7e89c057e 100644
--- a/src/modules/fancyzones/lib/JsonHelpers.cpp
+++ b/src/modules/fancyzones/lib/JsonHelpers.cpp
@@ -209,7 +209,18 @@ namespace JSONHelpers
 
     void FancyZonesData::CloneDeviceInfo(const std::wstring& source, const std::wstring& destination)
     {
+        if (source == destination)
+        {
+            return;
+        }
         std::scoped_lock lock{ dataLock };
+
+        // The source virtual desktop is deleted, simply ignore it.
+        if (!deviceInfoMap.contains(source))
+        {
+            return;
+        }
+
         // Clone information from source device if destination device is uninitialized (Blank).
         auto& destInfo = deviceInfoMap[destination];
         if (destInfo.activeZoneSet.type == ZoneSetLayoutType::Blank)