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

[ib]

Author: ib
Date: Sat Jan 26 02:07:36 2013
New Revision: 35898

Log:
Remove code almost identical to uiMenuDone() plus uiMenuInit().

Nothing but uiMenuDone() destroys the menu and nothing but
uiMenuInit() builds it.

This is analogous to rebuilding the playbar now.

Modified:
   trunk/gui/ui/actions.c

Modified: trunk/gui/ui/actions.c
==============================================================================
--- trunk/gui/ui/actions.c	Sat Jan 26 01:53:25 2013	(r35897)
+++ trunk/gui/ui/actions.c	Sat Jan 26 02:07:36 2013	(r35898)
@@ -635,21 +635,10 @@ void uiChangeSkin(char *name)
 
     /* reload menu window */
 
-    if (was_menu && guiApp.menuIsPresent) {
-        free(menuDrawBuffer);
-        menuDrawBuffer = calloc(1, guiApp.menu.Bitmap.ImageSize);
-
-        if (!menuDrawBuffer) {
-            gmp_msg(MSGT_GPLAYER, MSGL_FATAL, MSGTR_NEMDB);
-            mplayer(MPLAYER_EXIT_GUI, EXIT_ERROR, 0);
-        }
+    if (was_menu)
+        uiMenuDone();
 
-        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();
+    uiMenuInit();
 
     /* */