[EXPLORER] CTrayClockWnd: Fix a leak of font handles. CORE-13155
authorGiannis Adamopoulos <gadamopoulos@reactos.org>
Mon, 1 May 2017 09:35:03 +0000 (09:35 +0000)
committerGiannis Adamopoulos <gadamopoulos@reactos.org>
Mon, 1 May 2017 09:35:03 +0000 (09:35 +0000)
svn path=/trunk/; revision=74437

reactos/base/shell/explorer/trayntfy.cpp

index 00015fa..2c6c9fc 100644 (file)
@@ -714,20 +714,19 @@ public:
                 0,
                 TMT_TEXTCOLOR,
                 &textColor);
+
+            if (this->hFont != NULL)
+                DeleteObject(this->hFont);
+
+            SetFont(hFont, FALSE);
         }
         else
         {
-            NONCLIENTMETRICS ncm = { 0 };
-            ncm.cbSize = sizeof(ncm);
-            SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, FALSE);
-
-            hFont = CreateFontIndirectW(&ncm.lfMessageFont);
-
+            /* We don't need to set a font here, our parent will use 
+              * WM_SETFONT to set the right one when themes are not enabled. */
             textColor = RGB(0, 0, 0);
         }
 
-        SetFont(hFont, FALSE);
-
         CloseThemeData(clockTheme);
 
         return TRUE;