winemac: Don't try to set the app icon before GDI is properly initialized.

dlls/winemac.drv/macdrv_main.c

@@ -91,20 +91,6 @@ const char* debugstr_cf(CFTypeRef t)
 
 
 /***********************************************************************
- *              set_app_icon
- */
-static void set_app_icon(void)
-{
-    CFArrayRef images = create_app_icon_images();
-    if (images)
-    {
-        macdrv_set_application_icon(images);
-        CFRelease(images);
-    }
-}
-
-
-/***********************************************************************
  *              get_config_key
  *
  * Get a config key from either the app-specific or the default config
@@ -208,7 +194,6 @@ static BOOL process_attach(void)
         return FALSE;
     }
 
-    set_app_icon();
     macdrv_clipboard_process_attach();
 
     return TRUE;

dlls/winemac.drv/window.c

@@ -929,6 +929,20 @@ void activate_on_following_focus(void)
 }
 
 
+/***********************************************************************
+ *              set_app_icon
+ */
+static void set_app_icon(void)
+{
+    CFArrayRef images = create_app_icon_images();
+    if (images)
+    {
+        macdrv_set_application_icon(images);
+        CFRelease(images);
+    }
+}
+
+
 /**********************************************************************
  *              CreateDesktopWindow   (MACDRV.@)
  */
@@ -968,6 +982,7 @@ BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd)
         SERVER_END_REQ;
     }
 
+    set_app_icon();
     return TRUE;
 }