summaryrefslogtreecommitdiffstats
path: root/libmenu/vf_menu.c
diff options
context:
space:
mode:
authorulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-11-08 05:41:26 +0000
committerulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-11-08 05:41:26 +0000
commite573695a087e30648685517d608345624c1dfb8a (patch)
tree3d9f85e4b65ad17650487b6c85b4bfaa3d65ad83 /libmenu/vf_menu.c
parentac46121b3b28816f5d3834dd75f32474e73c4e2d (diff)
downloadmpv-e573695a087e30648685517d608345624c1dfb8a.tar.bz2
mpv-e573695a087e30648685517d608345624c1dfb8a.tar.xz
Fix pause key problem in correct way, only handle pause cmd when showing menu.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24988 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmenu/vf_menu.c')
-rw-r--r--libmenu/vf_menu.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c
index 6399cd4716..1282c3d13c 100644
--- a/libmenu/vf_menu.c
+++ b/libmenu/vf_menu.c
@@ -56,17 +56,13 @@ static int cmd_filter(mp_cmd_t* cmd, int paused, struct vf_priv_s * priv) {
switch(cmd->id) {
case MP_CMD_PAUSE :
-#if 0
- /* disabled because of
- * http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2003-March/017281.html
- * Subject: -menu & pause bug fix?
- * Date: Sun Mar 23 11:00:49 CET 2003
- */
+ if (!priv->current->show &&
+ (!priv->current->parent || !priv->current->parent->show))
+ break;
if(!paused && !go2pause) { // Initial pause cmd -> wait the next put_image
go2pause = 1;
return 1;
}
-#endif
if(go2pause == 2) // Msg resent by put_image after saving the image
go2pause = 0;
break;