[MPlayer-cvslog] r24988 - trunk/libmenu/vf_menu.c

[ulion]

Author: ulion
Date: Thu Nov  8 06:41:26 2007
New Revision: 24988

Log:
Fix pause key problem in correct way, only handle pause cmd when showing menu.


Modified:
   trunk/libmenu/vf_menu.c

Modified: trunk/libmenu/vf_menu.c
==============================================================================
--- trunk/libmenu/vf_menu.c	(original)
+++ trunk/libmenu/vf_menu.c	Thu Nov  8 06:41:26 2007
@@ -56,17 +56,13 @@ static int cmd_filter(mp_cmd_t* cmd, int
 
   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;