commit e929e3b603d0f375c4ae986137ae561131cc131e
author Alexandre Julliard <julliard@winehq.org> Wed Jan 23 16:40:54 2008 +0100
committer Alexandre Julliard <julliard@winehq.org> Wed Jan 23 16:41:09 2008 +0100
tree a9ff6b6e40ea98d2b576148313983510f8830937
parent 12d1d4041a78839b8fb0b260e2531e9d2a15ad3f

winex11: Get the icon from the window in case it was changed before the whole window was created.

dlls/winex11.drv/window.c

diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
index aa860ee..c52d13a 100644
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -849,8 +849,10 @@
 
     if (data->wm_hints)
     {
+        HICON icon = (HICON)SendMessageW( data->hwnd, WM_GETICON, ICON_BIG, 0 );
+        if (!icon) icon = (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICON );
         data->wm_hints->flags = 0;
-        set_icon_hints( display, data, (HICON)GetClassLongPtrW( data->hwnd, GCLP_HICON ) );
+        set_icon_hints( display, data, icon );
     }
 }