diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-18 19:40:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 19:40:31 +0100 |
| commit | 310496a89f583b49217915b9add165d51aea575e (patch) | |
| tree | dbd3274dc1208ffe6c4a0ec99be0747f5d2d1cb1 /platform/linuxbsd/display_server_x11.cpp | |
| parent | 7eb4e6415d74e3d4dae6ddd12bb0bdb7acf221c0 (diff) | |
| parent | 8e128726f0eac1982aa75a005554ee5b556b332e (diff) | |
| download | redot-engine-310496a89f583b49217915b9add165d51aea575e.tar.gz | |
Merge pull request #45617 from RandomShaper/modernize_atomics
Modernize atomics (and fix `volatile`)
Diffstat (limited to 'platform/linuxbsd/display_server_x11.cpp')
| -rw-r--r-- | platform/linuxbsd/display_server_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/linuxbsd/display_server_x11.cpp b/platform/linuxbsd/display_server_x11.cpp index 53baf17858..fceeb82325 100644 --- a/platform/linuxbsd/display_server_x11.cpp +++ b/platform/linuxbsd/display_server_x11.cpp @@ -2697,7 +2697,7 @@ bool DisplayServerX11::_wait_for_events() const { } void DisplayServerX11::_poll_events() { - while (!events_thread_done) { + while (!events_thread_done.is_set()) { _wait_for_events(); // Process events from the queue. @@ -4279,7 +4279,7 @@ DisplayServerX11::~DisplayServerX11() { _clipboard_transfer_ownership(XA_PRIMARY, x11_main_window); _clipboard_transfer_ownership(XInternAtom(x11_display, "CLIPBOARD", 0), x11_main_window); - events_thread_done = true; + events_thread_done.set(); events_thread.wait_to_finish(); //destroy all windows |