asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash on cleanup of EditorFileServer

Browse source 
(cherry picked from commit 565796518d)
This commit is contained in:
Pedro J. Estébanez 2021-03-06 13:26:16 +01:00 committed by Rémi Verschelde
parent 2e9c6a5129
commit 8be3995efa
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editor/fileserver/editor_file_server.cpp
View file

@ -43,7 +43,7 @@ void EditorFileServer::_close_client(ClientData *cd) {
cd->connection->disconnect_from_host(); cd->connection->disconnect_from_host();
cd->efs->wait_mutex.lock(); cd->efs->wait_mutex.lock();
cd->efs->to_wait.insert(&cd->thread); cd->efs->to_wait.insert(cd->thread);
cd->efs->wait_mutex.unlock(); cd->efs->wait_mutex.unlock();
while (cd->files.size()) { while (cd->files.size()) {
memdelete(cd->files.front()->get()); memdelete(cd->files.front()->get());
@ -291,7 +291,8 @@ void EditorFileServer::_thread_start(void *s) {
cd->connection = self->server->take_connection(); cd->connection = self->server->take_connection();
cd->efs = self; cd->efs = self;
cd->quit = false; cd->quit = false;
cd->thread.start(_subthread_start, cd); cd->thread = memnew(Thread);
cd->thread->start(_subthread_start, cd);
} }
} }

3
editor/fileserver/editor_file_server.h
View file

@ -48,8 +48,7 @@ class EditorFileServer : public Object {
}; };
struct ClientData { struct ClientData {
Thread *thread;
Thread thread;
Ref<StreamPeerTCP> connection; Ref<StreamPeerTCP> connection;
Map<int, FileAccess *> files; Map<int, FileAccess *> files;
EditorFileServer *efs; EditorFileServer *efs;