summaryrefslogtreecommitdiffstats
path: root/platform/web
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-02-12 13:34:41 +0100
committerRémi Verschelde <rverschelde@gmail.com>2024-02-12 13:34:41 +0100
commited7f1186a61de186e1ab625dbc3bb053babfc4a1 (patch)
tree39af7b79d3f50f9a4f69a7bdaac3d6a0223d04d6 /platform/web
parent08b4dddf4c99c0833a768670fe6f4d1f8f67d941 (diff)
parentc32e48890f416b347fb26d8045c795a0bcabb03b (diff)
downloadredot-engine-ed7f1186a61de186e1ab625dbc3bb053babfc4a1.tar.gz
Merge pull request #88155 from Rubonnek/use-safeflag-instead
Use `SafeFlag` for `EditorHTTPServer.server_quit`
Diffstat (limited to 'platform/web')
-rw-r--r--platform/web/export/editor_http_server.cpp6
-rw-r--r--platform/web/export/editor_http_server.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/platform/web/export/editor_http_server.cpp b/platform/web/export/editor_http_server.cpp
index 0ccd4b8782..9cf862eb1e 100644
--- a/platform/web/export/editor_http_server.cpp
+++ b/platform/web/export/editor_http_server.cpp
@@ -32,7 +32,7 @@
void EditorHTTPServer::_server_thread_poll(void *data) {
EditorHTTPServer *web_server = static_cast<EditorHTTPServer *>(data);
- while (!web_server->server_quit.get()) {
+ while (!web_server->server_quit.is_set()) {
OS::get_singleton()->delay_usec(6900);
{
MutexLock lock(web_server->server_lock);
@@ -193,7 +193,7 @@ void EditorHTTPServer::_poll() {
}
void EditorHTTPServer::stop() {
- server_quit.set(true);
+ server_quit.set();
if (server_thread.is_started()) {
server_thread.wait_to_finish();
}
@@ -227,7 +227,7 @@ Error EditorHTTPServer::listen(int p_port, IPAddress p_address, bool p_use_tls,
}
Error err = server->listen(p_port, p_address);
if (err == OK) {
- server_quit.set(false);
+ server_quit.clear();
server_thread.start(_server_thread_poll, this);
}
return err;
diff --git a/platform/web/export/editor_http_server.h b/platform/web/export/editor_http_server.h
index 8f5f69cc1e..4437492b5a 100644
--- a/platform/web/export/editor_http_server.h
+++ b/platform/web/export/editor_http_server.h
@@ -51,7 +51,7 @@ private:
uint8_t req_buf[4096];
int req_pos = 0;
- SafeNumeric<bool> server_quit;
+ SafeFlag server_quit;
Mutex server_lock;
Thread server_thread;