summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-09-15 09:29:10 +0000
committerfaust3 <faust3@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-09-15 09:29:10 +0000
commit49c553dc7fbeb3e62a046cb8d51aec3ab90a83cc (patch)
tree1e3f707560ebb616bb97375d6f79571b8f2fb65e /mplayer.c
parent5a487848031ac51b02f5e56b2011b620fa9be037 (diff)
downloadmpv-49c553dc7fbeb3e62a046cb8d51aec3ab90a83cc.tar.bz2
mpv-49c553dc7fbeb3e62a046cb8d51aec3ab90a83cc.tar.xz
quit slave mode command now accepts an exit value, patch by Aurelien Jacobs <aurel at gnuage.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13339 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mplayer.c b/mplayer.c
index 22d43a39f0..25a4404c76 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -614,7 +614,7 @@ static int libmpdemux_was_interrupted(int eof) {
if((cmd = mp_input_get_cmd(0,0)) != NULL) {
switch(cmd->id) {
case MP_CMD_QUIT:
- exit_player_with_rc(MSGTR_Exit_quit, 0);
+ exit_player_with_rc(MSGTR_Exit_quit, (cmd->nargs > 0)? cmd->args[0].v.i : 0);
case MP_CMD_PLAY_TREE_STEP: {
eof = (cmd->args[0].v.i > 0) ? PT_NEXT_ENTRY : PT_PREV_ENTRY;
} break;
@@ -2541,7 +2541,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
brk_cmd = 1;
} break;
case MP_CMD_QUIT : {
- exit_player_with_rc(MSGTR_Exit_quit, 0);
+ exit_player_with_rc(MSGTR_Exit_quit, (cmd->nargs > 0)? cmd->args[0].v.i : 0);
}
case MP_CMD_GRAB_FRAMES : {
grab_frames=2;