Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

lua: subprocess: support cancellation on Windows

Browse Source
This commit is contained in:
James Ross-Gowan
2014-11-18 13:20:59 +11:00
committed by wm4
parent 9e77ba8003
commit c644178098
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
player/lua.c
View File

@@ -1360,7 +1360,8 @@ static int subprocess(char **args, struct mp_cancel *cancel, void *ctx,
*error = NULL;
// List of handles to watch with sparse_wait
HANDLE handles[] = { pipes[0].ol.hEvent, pipes[1].ol.hEvent, pi.hProcess };
HANDLE handles[] = { pipes[0].ol.hEvent, pipes[1].ol.hEvent, pi.hProcess,
cancel ? mp_cancel_get_event(cancel) : NULL };
for (int i = 0; i < 2; i++) {
// Close our copy of the write end of the pipes
@@ -1404,6 +1405,13 @@ static int subprocess(char **args, struct mp_cancel *cancel, void *ctx,
CloseHandle(pi.hProcess);
handles[i] = pi.hProcess = NULL;
break;
case 3:
if (pi.hProcess) {
TerminateProcess(pi.hProcess, 1);
*error = "killed";
goto done;
}
break;
default:
goto done;
}