fix(windows): crash on destruction of allocations vector

Soundux · Jun 10, 2021 · 8ea6862 · 8ea6862
1 parent 179e8d5
commit 8ea6862
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/tray/include/core/windows/tray.hpp b/tray/include/core/windows/tray.hpp
@@ -20,6 +20,7 @@ namespace Tray
         static HMENU construct(const std::vector<std::shared_ptr<TrayEntry>> &, Tray *parent, bool cleanup = false);
 
       public:
+        ~Tray();
         Tray(std::string identifier, Icon icon);
         template <typename... T> Tray(std::string identifier, Icon icon, const T &...entries) : Tray(identifier, icon)
         {

diff --git a/tray/src/core/windows/tray.cpp b/tray/src/core/windows/tray.cpp
@@ -54,7 +54,10 @@ Tray::Tray::Tray(std::string identifier, Icon icon) : BaseTray(std::move(identif
     }
     trayList.insert({hwnd, *this});
 }
-
+Tray::Tray::~Tray()
+{
+    allocations.clear();
+}
 void Tray::Tray::exit()
 {
     Shell_NotifyIcon(NIM_DELETE, &notifyData);
@@ -63,10 +66,10 @@ void Tray::Tray::exit()
 
     UnregisterClass(identifier.c_str(), GetModuleHandle(nullptr));
     PostMessage(hwnd, WM_QUIT, 0, 0);
-    trayList.erase(hwnd);
     allocations.clear();
 
     DestroyIcon(notifyData.hIcon);
+    trayList.erase(hwnd);
 }
 
 void Tray::Tray::update()