summaryrefslogtreecommitdiffstats
path: root/drivers/unix/os_unix.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-08-21 22:47:21 +0200
committerGitHub <noreply@github.com>2018-08-21 22:47:21 +0200
commit4bf15d809013c6c70af20632f181b5ca0e75e47c (patch)
tree51502d749dac35cd39468577bc77a241a6aad5cf /drivers/unix/os_unix.cpp
parent0a8ac1a57c00db32464b7ea30dd9fd6404936948 (diff)
parentca1c851dbdc14701695d9589225b44d5681606f0 (diff)
downloadredot-engine-4bf15d809013c6c70af20632f181b5ca0e75e47c.tar.gz
Merge pull request #21236 from dragmz/windows-graceful-close
Try closing gracefully before terminating process
Diffstat (limited to 'drivers/unix/os_unix.cpp')
-rw-r--r--drivers/unix/os_unix.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 05dfd69f58..8aab4cb521 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -329,7 +329,7 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, bo
return OK;
}
-Error OS_Unix::kill(const ProcessID &p_pid) {
+Error OS_Unix::kill(const ProcessID &p_pid, const int p_max_wait_msec) {
int ret = ::kill(p_pid, SIGKILL);
if (!ret) {