RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Do not use exit_player in the signal handler, this code just can not 

be called from a signal handler.
Instead only make the input system generate quit commands for the first
CTRL+C and otherwise do getch2_disable and exit.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25651 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-01-08 21:40:44 +00:00
parent 87340de57f
commit 876b028289
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input/input.c
View File

@ -541,6 +541,8 @@ static mp_cmd_filter_t* cmd_filters = NULL;
// Callback to allow the menu filter to grab the incoming keys
int (*mp_input_key_cb)(int code) = NULL;
int async_quit_request;
static mp_input_fd_t key_fds[MP_MAX_KEY_FD];
static unsigned int num_key_fd = 0;
static mp_input_fd_t cmd_fds[MP_MAX_CMD_FD];
@ -1312,6 +1314,8 @@ mp_input_get_cmd(int time, int paused, int peek_only) {
mp_cmd_filter_t* cf;
int from_queue;
if (async_quit_request)
return mp_input_parse_cmd("quit 1");
while(1) {
from_queue = 1;
ret = mp_input_get_queued_cmd(peek_only);

2
input/input.h
View File

@ -298,4 +298,6 @@ mp_input_uninit(void);
int
mp_input_check_interrupt(int time);
extern int async_quit_request;
#endif /* INPUT_H */

6
mplayer.c
View File

@ -764,7 +764,8 @@ static void exit_sighandler(int x){
case SIGQUIT:
case SIGTERM:
case SIGKILL:
break; // killed from keyboard (^C) or killed [-9]
async_quit_request = 1;
return; // killed from keyboard (^C) or killed [-9]
case SIGILL:
#ifdef RUNTIME_CPUDETECT
mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL_RTCpuSel);
@ -798,7 +799,8 @@ static void exit_sighandler(int x){
}
#endif
}
exit_player(NULL);
getch2_disable();
exit(1);
}
extern void mp_input_register_options(m_config_t* cfg);