destroy overlay on new window instead of updating parent (#1039)

RetroAchievements · Nov 12, 2023 · 2164dcc · 2164dcc
1 parent a81c22e
commit 2164dcc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/ui/win32/OverlayWindow.cpp b/src/ui/win32/OverlayWindow.cpp
@@ -57,14 +57,15 @@ void OverlayWindow::CreateOverlayWindow(HWND hWnd)
 
     if (m_hOverlayWnd && IsWindow(m_hOverlayWnd))
     {
-        // overlay window exists, just update the parent (if necessary)
+        // overlay window already exists, destroy before creating a new one
         if (m_hWnd != hWnd)
         {
-            m_hWnd = hWnd;
-            SetParent(m_hOverlayWnd, hWnd);
-            UpdateOverlayPosition();
+            DestroyOverlayWindow();
+        }
+        else
+        {
+            return;
         }
-        return;
     }
 
     // overlay window does not exist, create it
@@ -197,8 +198,13 @@ void OverlayWindow::CreateOverlayWindow()
     });
 }
 
-void OverlayWindow::DestroyOverlayWindow() noexcept
+void OverlayWindow::DestroyOverlayWindow() 
 {
+
+    //clear current popups so they don't interfere with creation of a new overlay
+    auto& pOverlayManager = ra::services::ServiceLocator::GetMutable<ra::ui::viewmodels::OverlayManager>();
+    pOverlayManager.ClearPopups();
+
     if (m_hEventHook)
     {
         UnhookWinEvent(m_hEventHook);

diff --git a/src/ui/win32/OverlayWindow.hh b/src/ui/win32/OverlayWindow.hh
@@ -13,7 +13,7 @@ class OverlayWindow
 {
 public:
     void CreateOverlayWindow(HWND hWnd);
-    void DestroyOverlayWindow() noexcept;
+    void DestroyOverlayWindow();
 
     void OnOverlayMoved() noexcept;