Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-19 16:03:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #45617 from RandomShaper/modernize_atomics

Browse source 
Modernize atomics (and fix `volatile`)
This commit is contained in:
Rémi Verschelde 2021-02-18 19:40:31 +01:00 • committed by GitHub
commit 310496a89f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 650 additions and 639 deletions
Download patch file Download diff file Expand all files Collapse all files

6
editor/editor_node.cpp
View file

@ -5555,7 +5555,8 @@ static void _execute_thread(void *p_ud) {
eta->exitcode = err;
}
eta->done = true;
eta->done.set();
;
}
int EditorNode::execute_and_show_output(const String &p_title, const String &p_path, const List<String> &p_arguments, bool p_close_on_ok, bool p_close_on_errors) {
@ -5569,13 +5570,12 @@ int EditorNode::execute_and_show_output(const String &p_title, const String &p_p
eta.path = p_path;
eta.args = p_arguments;
eta.exitcode = 255;
eta.done = false;
int prev_len = 0;
eta.execute_output_thread.start(_execute_thread, &eta);
while (!eta.done) {
while (!eta.done.is_set()) {
{
MutexLock lock(eta.execute_output_mutex);
if (prev_len != eta.output.length()) {