godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

Fix data race regarding server_quit in EditorExportPlatformWeb

Browse Source
This commit is contained in:
jsjtxietian
2024-02-07 11:27:38 +08:00
parent b4e2a24c1f
commit ea974e1877
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/web/export/export_plugin.cpp
View File

@@ -676,7 +676,7 @@ Ref<Texture2D> EditorExportPlatformWeb::get_run_icon() const {
void EditorExportPlatformWeb::_server_thread_poll(void *data) { void EditorExportPlatformWeb::_server_thread_poll(void *data) {
EditorExportPlatformWeb *ej = static_cast<EditorExportPlatformWeb *>(data); EditorExportPlatformWeb *ej = static_cast<EditorExportPlatformWeb *>(data);
while (!ej->server_quit) { while (!ej->server_quit.get()) {
OS::get_singleton()->delay_usec(6900); OS::get_singleton()->delay_usec(6900);
{ {
MutexLock lock(ej->server_lock); MutexLock lock(ej->server_lock);
@@ -714,7 +714,7 @@ EditorExportPlatformWeb::~EditorExportPlatformWeb() {
if (server.is_valid()) { if (server.is_valid()) {
server->stop(); server->stop();
} }
server_quit = true; server_quit.set(true);
if (server_thread.is_started()) { if (server_thread.is_started()) {
server_thread.wait_to_finish(); server_thread.wait_to_finish();
} }

2
platform/web/export/export_plugin.h
View File

@@ -52,7 +52,7 @@ class EditorExportPlatformWeb : public EditorExportPlatform {
int menu_options = 0; int menu_options = 0;
Ref<EditorHTTPServer> server; Ref<EditorHTTPServer> server;
bool server_quit = false; SafeNumeric<bool> server_quit;
Mutex server_lock; Mutex server_lock;
Thread server_thread; Thread server_thread;