fix the biggest gdiobject (font) leak

sumatrapdfreader · Oct 19, 2023 · 7ce826e · 7ce826e
1 parent a36ed26
commit 7ce826e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/Menu.cpp b/src/Menu.cpp
@@ -1861,6 +1861,7 @@ void FreeAllMenuDrawInfos() {
         // Note: could be faster
         FreeMenuOwnerDrawInfo(g_menuDrawInfos[0]);
     }
+    DeleteMenuFont();
 }
 
 void FreeMenuOwnerDrawInfo(MenuOwnerDrawInfo* modi) {
@@ -1881,6 +1882,10 @@ HFONT GetMenuFont() {
     return gMenuFont;
 }
 
+void DeleteMenuFont() {
+    DeleteFontSafe(&gMenuFont);
+}
+
 struct MenuText {
     WCHAR* menuText;
     int menuTextLen;

diff --git a/src/Notifications.cpp b/src/Notifications.cpp
@@ -163,8 +163,12 @@ int GetWndX(NotificationWnd* wnd) {
 }
 
 NotificationWnd::~NotificationWnd() {
+    auto fontToDelete = font;
     Destroy();
     str::Free(progressMsg);
+    if (fontToDelete) {
+        DeleteObject(fontToDelete);
+    }
 }
 
 HWND NotificationWnd::Create(NotificationCreateArgs& args) {