diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2021-03-06 13:26:16 +0100 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2021-03-06 13:29:40 +0100 |
| commit | 565796518d27e345c4d53a13048f306a8f2c57a7 (patch) | |
| tree | cf1a65730d6e4eacac4f324c0d76fb19eb9c3b10 /editor/fileserver/editor_file_server.cpp | |
| parent | 17e66382b8e50cf7b58b8ecf4c12628408529538 (diff) | |
Fix crash on cleanup of EditorFileServer
Diffstat (limited to 'editor/fileserver/editor_file_server.cpp')
| -rw-r--r-- | editor/fileserver/editor_file_server.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/editor/fileserver/editor_file_server.cpp b/editor/fileserver/editor_file_server.cpp index 07edae833d..d80003a12a 100644 --- a/editor/fileserver/editor_file_server.cpp +++ b/editor/fileserver/editor_file_server.cpp @@ -43,7 +43,7 @@ void EditorFileServer::_close_client(ClientData *cd) { cd->connection->disconnect_from_host(); { MutexLock lock(cd->efs->wait_mutex); - cd->efs->to_wait.insert(&cd->thread); + cd->efs->to_wait.insert(cd->thread); } while (cd->files.size()) { memdelete(cd->files.front()->get()); @@ -278,7 +278,8 @@ void EditorFileServer::_thread_start(void *s) { cd->connection = self->server->take_connection(); cd->efs = self; cd->quit = false; - cd->thread.start(_subthread_start, cd); + cd->thread = memnew(Thread); + cd->thread->start(_subthread_start, cd); } } |