From 1344f05cba8a810903d3c30d70f45f2a4732b3f4 Mon Sep 17 00:00:00 2001 From: colin Date: Fri, 22 Nov 2002 12:01:59 +0000 Subject: [PATCH] better fix for my previous 10l git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8252 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmenu/menu.c | 1 - libmenu/vf_menu.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libmenu/menu.c b/libmenu/menu.c index 3b0a6eb824..d807b0ee03 100644 --- a/libmenu/menu.c +++ b/libmenu/menu.c @@ -172,7 +172,6 @@ void menu_dflt_read_key(menu_t* menu,int cmd) { 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: diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index b1fd822f36..7d81834231 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -165,7 +165,8 @@ inline static void copy_mpi(mp_image_t *dmpi, mp_image_t *mpi) { 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;