[MPlayer-cvslog] r37145 - trunk/gui/win32/skinload.c

[ib]

Author: ib
Date: Wed Apr  9 14:46:06 2014
New Revision: 37145

Log:
Relocate code added in r36991.

Perform the changes after mp_msg() debug output
in order to not confuse the user.

The changes are only internal ones.

Modified:
   trunk/gui/win32/skinload.c

Modified: trunk/gui/win32/skinload.c
==============================================================================
--- trunk/gui/win32/skinload.c	Mon Apr  7 06:25:56 2014	(r37144)
+++ trunk/gui/win32/skinload.c	Wed Apr  9 14:46:06 2014	(r37145)
@@ -393,12 +393,6 @@ static void addwidget(skin_t *skin, wind
         mywidget->y = mywidget->wy = atoi(findnextstring(temp, desc, &base));
         mywidget->wwidth = atoi(findnextstring(temp, desc, &base));
         mywidget->wheight = atoi(findnextstring(temp, desc, &base));
-        if (mywidget->bitmap[0] == NULL || mywidget->width == 0 || mywidget->height == 0)
-        {
-            mywidget->bitmap[0] = mywidget->bitmap[1];
-            mywidget->width = mywidget->wwidth;
-            mywidget->height = mywidget->wheight;
-        }
         findnextstring(temp, desc, &base);
         mywidget->msg = evNone;
         for (i=0; i<evBoxs; i++)
@@ -420,6 +414,12 @@ static void addwidget(skin_t *skin, wind
                 mywidget->phases, mywidget->value,
                 mywidget->wx, mywidget->wy, mywidget->wwidth, mywidget->wwidth,
                 mywidget->msg);
+        if (mywidget->bitmap[0] == NULL || mywidget->width == 0 || mywidget->height == 0)
+        {
+            mywidget->bitmap[0] = mywidget->bitmap[1];
+            mywidget->width = mywidget->wwidth;
+            mywidget->height = mywidget->wheight;
+        }
     }
     else if(!strncmp(desc, "pimage", 6))
     {