diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2021-01-19 13:29:41 +0100 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2021-01-29 12:02:13 +0100 |
| commit | 99fe462452be44efa618e83ad9bbecd722ae6ecd (patch) | |
| tree | 9bd84bc560b2c8049234d92d217396d21e68ba28 /editor/editor_node.cpp | |
| parent | 6ddfc8e7187bd2b25b5caa61dee8fdca05af6298 (diff) | |
| download | redot-engine-99fe462452be44efa618e83ad9bbecd722ae6ecd.tar.gz | |
Modernize Thread
- Based on C++11's `thread` and `thread_local`
- No more need to allocate-deallocate or check for null
- No pointer anymore, just a member variable
- Platform-specific implementations no longer needed (except for the few cases of non-portable functions)
- Simpler for `NO_THREADS`
- Thread ids are now the same across platforms (main is 1; others follow)
Diffstat (limited to 'editor/editor_node.cpp')
| -rw-r--r-- | editor/editor_node.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 0ef21d3a11..62f4b21d5c 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -5485,9 +5485,7 @@ int EditorNode::execute_and_show_output(const String &p_title, const String &p_p int prev_len = 0; - eta.execute_output_thread = Thread::create(_execute_thread, &eta); - - ERR_FAIL_COND_V(!eta.execute_output_thread, 0); + eta.execute_output_thread.start(_execute_thread, &eta); while (!eta.done) { { @@ -5502,8 +5500,7 @@ int EditorNode::execute_and_show_output(const String &p_title, const String &p_p OS::get_singleton()->delay_usec(1000); } - Thread::wait_to_finish(eta.execute_output_thread); - memdelete(eta.execute_output_thread); + eta.execute_output_thread.wait_to_finish(); execute_outputs->add_text("\nExit Code: " + itos(eta.exitcode)); if (p_close_on_errors && eta.exitcode != 0) { |