diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-21 22:47:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-21 22:47:21 +0200 |
| commit | 4bf15d809013c6c70af20632f181b5ca0e75e47c (patch) | |
| tree | 51502d749dac35cd39468577bc77a241a6aad5cf /core | |
| parent | 0a8ac1a57c00db32464b7ea30dd9fd6404936948 (diff) | |
| parent | ca1c851dbdc14701695d9589225b44d5681606f0 (diff) | |
Merge pull request #21236 from dragmz/windows-graceful-close
Try closing gracefully before terminating process
Diffstat (limited to 'core')
| -rw-r--r-- | core/os/os.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/os/os.h b/core/os/os.h index dd783408e8..12c0222ad4 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -254,7 +254,7 @@ public: virtual String get_executable_path() const; virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false) = 0; - virtual Error kill(const ProcessID &p_pid) = 0; + virtual Error kill(const ProcessID &p_pid, const int p_max_wait_msec = -1) = 0; virtual int get_process_id() const; virtual Error shell_open(String p_uri); |