# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1336500888 0
# Node ID 8228b3cf8f3754c82894c10336d9d55560d5a9df
# Parent  b39c137cc6f5b319191faf3cc17efb3dd7733ad5
Same fix on Windows as I just committed on OS/2.

diff -r b39c137cc6f5 -r 8228b3cf8f37 win/dw.c
--- a/win/dw.c	Tue May 08 17:34:36 2012 +0000
+++ b/win/dw.c	Tue May 08 18:14:48 2012 +0000
@@ -6622,12 +6622,7 @@
    char *file;
    FILE *fp;
 
-   if ( id )
-   {
-      hbitmap = LoadBitmap( DWInstance, MAKEINTRESOURCE(id) );
-      icon = LoadImage( DWInstance, MAKEINTRESOURCE(id), IMAGE_ICON, 0, 0, LR_SHARED );
-   }
-   else if (data)
+   if (data)
    {
       file = _tempnam( _dw_alternate_temp_dir, "dw" );
       if ( file != NULL )
@@ -6658,6 +6653,11 @@
       if (icon == 0 && hbitmap == 0)
          return;
    }
+   else if ( id )
+   {
+      hbitmap = LoadBitmap( DWInstance, MAKEINTRESOURCE(id) );
+      icon = LoadImage( DWInstance, MAKEINTRESOURCE(id), IMAGE_ICON, 0, 0, LR_SHARED );
+   }
 
    if ( icon )
    {