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

Merge pull request #45315 from RandomShaper/modernize_thread

Browse Source 
Modernize Thread
This commit is contained in:
Rémi Verschelde
2021-01-31 15:24:56 +01:00
committed by GitHub
parent 02eb11450b 99fe462452
commit 5525cd85c6
87 changed files with 385 additions and 1056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/javascript/export/export.cpp
View File

@@ -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() {