RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-02 04:42:10 +00:00
Code Issues Releases Wiki Activity

input: fix exiting with signals

Browse Source 
Quitting through SIGTERM etc. was accidentally ignored since commit
f5af5962 from today.
This commit is contained in:
wm4 2014-09-08 01:11:32 +02:00
parent 8c7a9b0cd0
commit 3b5f28bd0f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input/input.c
View File

@ -192,7 +192,6 @@ int async_quit_request;
static int parse_config(struct input_ctx *ictx, bool builtin, bstr data, static int parse_config(struct input_ctx *ictx, bool builtin, bstr data,
const char *location, const char *restrict_section); const char *location, const char *restrict_section);
static void close_input_sources(struct input_ctx *ictx); static void close_input_sources(struct input_ctx *ictx);
static bool test_abort(struct input_ctx *ictx);
#define OPT_BASE_STRUCT struct input_opts #define OPT_BASE_STRUCT struct input_opts
struct input_opts { struct input_opts {
@ -1176,9 +1175,10 @@ mp_cmd_t *mp_input_read_cmd(struct input_ctx *ictx)
{ {
input_lock(ictx); input_lock(ictx);
read_events(ictx, 0); read_events(ictx, 0);
if (async_quit_request && !test_abort(ictx)) { if (async_quit_request && !queue_has_abort_cmds(&ictx->cmd_queue)) {
struct mp_cmd *cmd = mp_input_parse_cmd(ictx, bstr0("quit"), ""); struct mp_cmd *cmd = mp_input_parse_cmd(ictx, bstr0("quit"), "");
queue_add_head(&ictx->cmd_queue, cmd); queue_add_head(&ictx->cmd_queue, cmd);
async_quit_request = 0;
} }
struct cmd_queue *queue = &ictx->cmd_queue; struct cmd_queue *queue = &ictx->cmd_queue;
if (!queue->first) { if (!queue->first) {