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/javascript/export | |
| parent | 02eb11450b4151b02db861b5029783e52e16c603 (diff) | |
| parent | 99fe462452be44efa618e83ad9bbecd722ae6ecd (diff) | |
Merge pull request #45315 from RandomShaper/modernize_thread
Modernize Thread
Diffstat (limited to 'platform/javascript/export')
| -rw-r--r-- | platform/javascript/export/export.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index dd0938ee3e..f5d8a68994 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -214,7 +214,7 @@ class EditorExportPlatformJavaScript : public EditorExportPlatform { Ref<EditorHTTPServer> server; bool server_quit = false; Mutex server_lock; - Thread *server_thread = nullptr; + Thread server_thread; enum ExportMode { EXPORT_MODE_NORMAL = 0, @@ -682,7 +682,7 @@ void EditorExportPlatformJavaScript::_server_thread_poll(void *data) { EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() { server.instance(); - server_thread = Thread::create(_server_thread_poll, this); + server_thread.start(_server_thread_poll, this); Ref<Image> img = memnew(Image(_javascript_logo)); logo.instance(); @@ -703,8 +703,7 @@ EditorExportPlatformJavaScript::EditorExportPlatformJavaScript() { EditorExportPlatformJavaScript::~EditorExportPlatformJavaScript() { server->stop(); server_quit = true; - Thread::wait_to_finish(server_thread); - memdelete(server_thread); + server_thread.wait_to_finish(); } void register_javascript_exporter() { |