mirror of https://github.com/mpv-player/mpv
better fix for my previous 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8252 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
8aab1c9486
commit
1344f05cba
|
@ -172,7 +172,6 @@ void menu_dflt_read_key(menu_t* menu,int cmd) {
|
||||||
case KEY_LEFT:
|
case KEY_LEFT:
|
||||||
case KEY_ESC:
|
case KEY_ESC:
|
||||||
menu->read_cmd(menu,MENU_CMD_CANCEL);
|
menu->read_cmd(menu,MENU_CMD_CANCEL);
|
||||||
if(menu->parent != NULL) menu->show = 1;
|
|
||||||
break;
|
break;
|
||||||
case KEY_RIGHT:
|
case KEY_RIGHT:
|
||||||
case KEY_ENTER:
|
case KEY_ENTER:
|
||||||
|
|
|
@ -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){
|
static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
|
||||||
mp_image_t *dmpi = NULL;
|
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
|
// Close all menu who requested it
|
||||||
while(vf->priv->current->cl && vf->priv->current != vf->priv->root) {
|
while(vf->priv->current->cl && vf->priv->current != vf->priv->root) {
|
||||||
menu_t* m = vf->priv->current;
|
menu_t* m = vf->priv->current;
|
||||||
|
|
Loading…
Reference in New Issue