diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-23 08:19:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-23 08:19:09 +0100 |
commit | c9cf6b102f65e277613a0ff2f2bcc54f7bff0f1d (patch) | |
tree | 7fab75c48809ecec2bdd9c6750203eb33d7812b1 /platform/javascript/os_javascript.h | |
parent | 05fc26de1cd4b11f9f3351b42fb4c5b7c626856d (diff) | |
parent | 90a1f8d8a7789c6fa9191c8684cd24edca066577 (diff) | |
download | redot-engine-c9cf6b102f65e277613a0ff2f2bcc54f7bff0f1d.tar.gz |
Merge pull request #35454 from Calinou/os-execute-default-blocking
Make `OS.execute()` blocking by default if not specified
Diffstat (limited to 'platform/javascript/os_javascript.h')
-rw-r--r-- | platform/javascript/os_javascript.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index 2d1c765e76..5c02a292ee 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -141,7 +141,7 @@ public: void run_async(); bool main_loop_iterate(); - 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, Mutex *p_pipe_mutex = NULL); + virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking = true, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false, Mutex *p_pipe_mutex = NULL); virtual Error kill(const ProcessID &p_pid); virtual int get_process_id() const; |