stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8155001: SystemTray.remove() leaks GDI Objects in Windows

Browse Source 
Reviewed-by: serb, alexp
This commit is contained in:
Dmitry Markov 2016-05-13 12:44:53 +03:00
parent e931bc512f
commit 7a40b8d5f7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp
View File

@ -93,6 +93,12 @@ AwtTrayIcon::~AwtTrayIcon() {
void AwtTrayIcon::Dispose() { void AwtTrayIcon::Dispose() {
SendTrayMessage(NIM_DELETE); SendTrayMessage(NIM_DELETE);
// Destroy the icon to avoid leak of GDI objects
if (m_nid.hIcon != NULL) {
::DestroyIcon(m_nid.hIcon);
}
UnlinkObjects(); UnlinkObjects();
if (--sm_instCount == 0) { if (--sm_instCount == 0) {