diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-31 15:24:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-31 15:24:56 +0100 |
| commit | 5525cd85c60455b0bb9716bbef0ad2ad8111d752 (patch) | |
| tree | 52ff0e2d3e01dd2655feff1cf88f07e10d84aad1 /platform/linuxbsd/display_server_x11.cpp | |
| parent | 02eb11450b4151b02db861b5029783e52e16c603 (diff) | |
| parent | 99fe462452be44efa618e83ad9bbecd722ae6ecd (diff) | |
| download | redot-engine-5525cd85c60455b0bb9716bbef0ad2ad8111d752.tar.gz | |
Merge pull request #45315 from RandomShaper/modernize_thread
Modernize Thread
Diffstat (limited to 'platform/linuxbsd/display_server_x11.cpp')
| -rw-r--r-- | platform/linuxbsd/display_server_x11.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/platform/linuxbsd/display_server_x11.cpp b/platform/linuxbsd/display_server_x11.cpp index 3f1a7ced60..53baf17858 100644 --- a/platform/linuxbsd/display_server_x11.cpp +++ b/platform/linuxbsd/display_server_x11.cpp @@ -4266,7 +4266,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode } } - events_thread = Thread::create(_poll_events_thread, this); + events_thread.start(_poll_events_thread, this); _update_real_mouse_position(windows[MAIN_WINDOW_ID]); @@ -4280,9 +4280,7 @@ DisplayServerX11::~DisplayServerX11() { _clipboard_transfer_ownership(XInternAtom(x11_display, "CLIPBOARD", 0), x11_main_window); events_thread_done = true; - Thread::wait_to_finish(events_thread); - memdelete(events_thread); - events_thread = nullptr; + events_thread.wait_to_finish(); //destroy all windows for (Map<WindowID, WindowData>::Element *E = windows.front(); E; E = E->next()) { |