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 /editor | |
| parent | 0a8ac1a57c00db32464b7ea30dd9fd6404936948 (diff) | |
| parent | ca1c851dbdc14701695d9589225b44d5681606f0 (diff) | |
Merge pull request #21236 from dragmz/windows-graceful-close
Try closing gracefully before terminating process
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_run.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp index 749cf6aa2b..072bd948e1 100644 --- a/editor/editor_run.cpp +++ b/editor/editor_run.cpp @@ -181,8 +181,8 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li void EditorRun::stop() { if (status != STATUS_STOP && pid != 0) { - - OS::get_singleton()->kill(pid); + const int max_wait_msec = GLOBAL_DEF("editor/stop_max_wait_msec", 10000); + OS::get_singleton()->kill(pid, max_wait_msec); } status = STATUS_STOP; |