From 8fa2694395c7362b8886ee3e912f644d0e613270 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 13 Mar 2014 16:20:08 +0000 Subject: [PATCH] Fix resource leak in wxMSW wxStaticBitmap when using RGBA icons. Release the old handle if it wasn't freed by STM_SETIMAGE itself. Closes #16068. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/statbmp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/msw/statbmp.cpp b/src/msw/statbmp.cpp index 77e8df1aff..7296920f7b 100644 --- a/src/msw/statbmp.cpp +++ b/src/msw/statbmp.cpp @@ -294,10 +294,10 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image) m_isIcon ? IMAGE_ICON : IMAGE_BITMAP, (LPARAM)handle); // detect if this is still the handle we passed before or // if the static-control made a copy of the bitmap! - if (m_currentHandle != 0 && oldHandle != (HGDIOBJ) m_currentHandle) + if (oldHandle != 0 && oldHandle != (HGDIOBJ) m_currentHandle) { // the static control made a copy and we are responsible for deleting it - DeleteObject((HGDIOBJ) oldHandle); + ::DeleteObject((HGDIOBJ) oldHandle); } // Save bitmap handle only if it's not a temporary one, otherwise it's