From f8cc129f04ad51bb034dd9c7992b6c9976618e12 Mon Sep 17 00:00:00 2001
From: stefansjfw <57057282+stefansjfw@users.noreply.github.com>
Date: Mon, 15 Jun 2020 19:44:07 +0200
Subject: [PATCH] [FancyZones] Move Trace::VirtualDesktopChange (#4320)

* Move Trace::VirtualDesktopChange to catch only the actual VD changes

* Update the check

* Add double check
---
 src/modules/fancyzones/dll/dllmain.cpp    | 1 -
 src/modules/fancyzones/lib/FancyZones.cpp | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/modules/fancyzones/dll/dllmain.cpp b/src/modules/fancyzones/dll/dllmain.cpp
index d9518e9ab3..6d06f04911 100644
--- a/src/modules/fancyzones/dll/dllmain.cpp
+++ b/src/modules/fancyzones/dll/dllmain.cpp
@@ -281,7 +281,6 @@ void FancyZonesModule::HandleWinHookEvent(WinHookEvent* data) noexcept
         // switches virtual desktops.
         if (data->hwnd == GetDesktopWindow())
         {
-            Trace::VirtualDesktopChanged();
             m_app.as<IFancyZonesCallback>()->VirtualDesktopChanged();
         }
     }
diff --git a/src/modules/fancyzones/lib/FancyZones.cpp b/src/modules/fancyzones/lib/FancyZones.cpp
index 9706e4633b..a3cbdca23f 100644
--- a/src/modules/fancyzones/lib/FancyZones.cpp
+++ b/src/modules/fancyzones/lib/FancyZones.cpp
@@ -650,6 +650,10 @@ void FancyZones::OnDisplayChange(DisplayChangeType changeType) noexcept
         if (VirtualDesktopUtils::GetCurrentVirtualDesktopId(&currentVirtualDesktopId))
         {
             m_currentDesktopId = currentVirtualDesktopId;
+            if (m_previousDesktopId != GUID_NULL && m_currentDesktopId != m_previousDesktopId)
+            {
+                Trace::VirtualDesktopChanged();
+            }
         }
         if (changeType == DisplayChangeType::Initialization)
         {