godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Merge pull request #110485 from bruvzg/aemb_dtr

Browse Source 
Fix iOS/visionOS export plugin crash on exit.
This commit is contained in:
Rémi Verschelde
2025-10-13 07:35:19 +02:00
committed by GitHub
parent cb7cd815ee 906aff5331
commit 4219ce91f2
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editor/export/editor_export_platform_apple_embedded.cpp
View File

@@ -2799,10 +2799,4 @@ void EditorExportPlatformAppleEmbedded::_initialize(const char *p_platform_logo_
}
EditorExportPlatformAppleEmbedded::~EditorExportPlatformAppleEmbedded() {
#ifdef MACOS_ENABLED
quit_request.set();
if (check_for_changes_thread.is_started()) {
check_for_changes_thread.wait_to_finish();
}
#endif
}

7
editor/export/editor_export_platform_apple_embedded.h
View File

@@ -98,6 +98,13 @@ protected:
check_for_changes_thread.start(_check_for_changes_poll_thread, this);
}
void _stop_remote_device_poller_thread() {
quit_request.set();
if (check_for_changes_thread.is_started()) {
check_for_changes_thread.wait_to_finish();
}
}
int _execute(const String &p_path, const List<String> &p_arguments, std::function<void(const String &)> p_on_data);
private:

3
platform/ios/export/export_plugin.cpp
View File

@@ -47,6 +47,9 @@ void EditorExportPlatformIOS::initialize() {
}
EditorExportPlatformIOS::~EditorExportPlatformIOS() {
#ifdef MACOS_ENABLED
_stop_remote_device_poller_thread();
#endif
}
void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options) const {

3
platform/visionos/export/export_plugin.cpp
View File

@@ -47,6 +47,9 @@ void EditorExportPlatformVisionOS::initialize() {
}
EditorExportPlatformVisionOS::~EditorExportPlatformVisionOS() {
#ifdef MACOS_ENABLED
_stop_remote_device_poller_thread();
#endif
}
void EditorExportPlatformVisionOS::get_export_options(List<ExportOption> *r_options) const {