Mercurial > mplayer.hg

changeset 24960:983806685c44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix pause key problem in correct way, only handle pause cmd when showing menu.
author ulion
date Thu, 08 Nov 2007 05:41:26 +0000
parents f13b32b2bee4
children de251a0b5228
files libmenu/vf_menu.c
diffstat 1 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libmenu/vf_menu.c	Thu Nov 08 05:19:56 2007 +0000
+++ b/libmenu/vf_menu.c	Thu Nov 08 05:41:26 2007 +0000
@@ -56,17 +56,13 @@
 
   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;