[MPlayer-cvslog] r35894 - trunk/gui/ui/actions.c

[ib]

Author: ib
Date: Sat Jan 26 01:17:08 2013
New Revision: 35894

Log:
Change window reload order.

Main and video window must come first.

Modified:
   trunk/gui/ui/actions.c

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Sat Jan 26 01:07:38 2013	(r35893)
+++ trunk/gui/ui/actions.c	Sat Jan 26 01:17:08 2013	(r35894)
@@ -602,25 +602,15 @@ void uiChangeSkin(char *name)
         }
     }
 
-    /* reload menu window */
-
-    if (was_menu && guiApp.menuIsPresent) {
-        free(menuDrawBuffer);
-        menuDrawBuffer = calloc(1, guiApp.menu.Bitmap.ImageSize);
+    /* reload main window (must be first!) */
 
-        if (!menuDrawBuffer) {
-            gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_NEMDB);
-            mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
-        }
+    uiMainDone();
+    uiMainInit();
 
-        wsWindowResize(&guiApp.menuWindow, guiApp.menu.width, guiApp.menu.height);
-        wsImageResize(&guiApp.menuWindow, guiApp.menu.width, guiApp.menu.height);
-        wsWindowShape(&guiApp.menuWindow, guiApp.menu.Mask.Image);
-        wsWindowVisibility(&guiApp.menuWindow, wsHideWindow);
-    } else
-        uiMenuInit();
+    wsWindowVisibility(&guiApp.mainWindow, wsShowWindow);
+    mainVisible = True;
 
-    /* reload video window */
+    /* reload video window (must be second!) */
 
     if (guiApp.video.Bitmap.Image)
         wsImageResize(&guiApp.videoWindow, guiApp.video.Bitmap.Width, guiApp.video.Bitmap.Height);
@@ -643,13 +633,25 @@ void uiChangeSkin(char *name)
 
     uiPlaybarInit();
 
-    /* reload main window */
+    /* reload menu window */
 
-    uiMainDone();
-    uiMainInit();
+    if (was_menu && guiApp.menuIsPresent) {
+        free(menuDrawBuffer);
+        menuDrawBuffer = calloc(1, guiApp.menu.Bitmap.ImageSize);
 
-    wsWindowVisibility(&guiApp.mainWindow, wsShowWindow);
-    mainVisible = True;
+        if (!menuDrawBuffer) {
+            gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_NEMDB);
+            mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
+        }
+
+        wsWindowResize(&guiApp.menuWindow, guiApp.menu.width, guiApp.menu.height);
+        wsImageResize(&guiApp.menuWindow, guiApp.menu.width, guiApp.menu.height);
+        wsWindowShape(&guiApp.menuWindow, guiApp.menu.Mask.Image);
+        wsWindowVisibility(&guiApp.menuWindow, wsHideWindow);
+    } else
+        uiMenuInit();
+
+    /* */
 
     btnModify(evSetVolume, guiInfo.Volume);
     btnModify(evSetBalance, guiInfo.Balance);