Mercurial > mplayer.hg

changeset 37049:e2c10942873b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author ib
date Wed, 09 Apr 2014 12:46:06 +0000
parents 8132b4eef5dc
children 3555aa94b881
files gui/win32/skinload.c
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/gui/win32/skinload.c	Mon Apr 07 04:25:56 2014 +0000
+++ b/gui/win32/skinload.c	Wed Apr 09 12:46:06 2014 +0000
@@ -393,12 +393,6 @@
         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 @@
                 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))
     {