# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1336498476 0
# Node ID b39c137cc6f5b319191faf3cc17efb3dd7733ad5
# Parent  e6b139e0b64d2de1befc0ee00df815c8263d0075
Only use the ID on OS/2 in dw_window_set_bitmap_from_file() if
the data is NULL.

diff -r e6b139e0b64d -r b39c137cc6f5 os2/dw.c
--- a/os2/dw.c	Tue May 08 17:14:40 2012 +0000
+++ b/os2/dw.c	Tue May 08 17:34:36 2012 +0000
@@ -7055,13 +7055,7 @@
    /* Destroy any old bitmap data */
    _free_bitmap(handle);
 
-   /* If id is non-zero use the resource */
-   if ( id )
-   {
-      hps = WinGetPS( handle );
-      hbm = GpiLoadBitmap( hps, NULLHANDLE, id, 0, 0 );
-   }
-   else if ( data )
+   if ( data )
    {
       file = tmpnam( NULL );
       if ( file != NULL )
@@ -7091,6 +7085,12 @@
       dw_window_set_data(handle, "_dw_width", (void *)width);
       dw_window_set_data(handle, "_dw_height", (void *)height);
    }
+   /* If id is non-zero use the resource */
+   else if ( id )
+   {
+      hps = WinGetPS( handle );
+      hbm = GpiLoadBitmap( hps, NULLHANDLE, id, 0, 0 );
+   }
    else
       return;