Mercurial > mplayer.hg

changeset 8251:3d74366d947e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better fix for my previous 10l
author colin
date Fri, 22 Nov 2002 12:01:59 +0000
parents 66fdde2606bb
children 992675110ab8
files libmenu/menu.c libmenu/vf_menu.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmenu/menu.c	Fri Nov 22 10:14:37 2002 +0000
+++ b/libmenu/menu.c	Fri Nov 22 12:01:59 2002 +0000
@@ -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:
--- a/libmenu/vf_menu.c	Fri Nov 22 10:14:37 2002 +0000
+++ b/libmenu/vf_menu.c	Fri Nov 22 12:01:59 2002 +0000
@@ -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;