diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-05-30 15:00:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 15:00:10 +0200 |
| commit | 63b607257b9b84acd55e8a37097a9ad5ab0591db (patch) | |
| tree | bc8bea58b415ecf03bd10ff8bcf1339721abea7a /core | |
| parent | fc7f931d26900f70ec19f91837d1715e1a301834 (diff) | |
| parent | f392650be2434aadad71af95a0b81a33900e84ec (diff) | |
| download | redot-engine-63b607257b9b84acd55e8a37097a9ad5ab0591db.tar.gz | |
Merge pull request #19266 from akien-mga/os-execute-doc
Improve return value and docs on OS.execute regarding blocking/non-blocking variants
Diffstat (limited to 'core')
| -rw-r--r-- | core/bind/core_bind.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 14e3804840..b7f20588f2 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -399,7 +399,7 @@ Error _OS::shell_open(String p_uri) { int _OS::execute(const String &p_path, const Vector<String> &p_arguments, bool p_blocking, Array p_output) { - OS::ProcessID pid; + OS::ProcessID pid = -2; List<String> args; for (int i = 0; i < p_arguments.size(); i++) args.push_back(p_arguments[i]); @@ -412,6 +412,7 @@ int _OS::execute(const String &p_path, const Vector<String> &p_arguments, bool p else return pid; } + Error _OS::kill(int p_pid) { return OS::get_singleton()->kill(p_pid); |