[Mplayer-cvslog] CVS: main/libmenu vf_menu.c,1.3,1.4 menu.c,1.4,1.5

[Colin Leroy CVS]

Update of /cvsroot/mplayer/main/libmenu
In directory mail:/var/tmp.root/cvs-serv15126

Modified Files:
	vf_menu.c menu.c 
Log Message:
better fix for my previous 10l


Index: vf_menu.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmenu/vf_menu.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vf_menu.c	21 Nov 2002 18:31:21 -0000	1.3
+++ vf_menu.c	22 Nov 2002 12:01:59 -0000	1.4
@@ -165,7 +165,8 @@
 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
   mp_image_t *dmpi = NULL;
 
-  if(vf->priv->current->show) {
+  if(vf->priv->current->show 
+  || (vf->priv->current->parent && vf->priv->current->parent->show)) {
   // Close all menu who requested it
   while(vf->priv->current->cl && vf->priv->current != vf->priv->root) {
     menu_t* m = vf->priv->current;

Index: menu.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmenu/menu.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- menu.c	21 Nov 2002 19:26:57 -0000	1.4
+++ menu.c	22 Nov 2002 12:01:59 -0000	1.5
@@ -172,7 +172,6 @@
   case KEY_LEFT:
   case KEY_ESC:
     menu->read_cmd(menu,MENU_CMD_CANCEL);
-    if(menu->parent != NULL) menu->show = 1;
     break;
   case KEY_RIGHT:
   case KEY_ENTER: