diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-16 13:35:46 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-16 13:35:46 +0200 |
| commit | f91c1a7b88316218ce7c87257f8b3d5a40ad8a30 (patch) | |
| tree | 7c436ab673a8b3251e57b7dfbbc2dd8c40f9e955 /platform/android/export/export_plugin.cpp | |
| parent | e516b059e0008f95b64cfdf3ffe2c63bbab16e2b (diff) | |
| parent | e064efccbc0c48576bc23087ba8fd0773d13714d (diff) | |
| download | redot-engine-f91c1a7b88316218ce7c87257f8b3d5a40ad8a30.tar.gz | |
Merge pull request #97000 from Hilderin/fix-editor-doc-cache-locked-on-editor-startup
Fix `editor_doc_cache` locked by `adb` process on editor startup
Diffstat (limited to 'platform/android/export/export_plugin.cpp')
| -rw-r--r-- | platform/android/export/export_plugin.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index d78f8db79c..fd07324557 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -294,7 +294,9 @@ void EditorExportPlatformAndroid::_check_for_changes_poll_thread(void *ud) { // Check for devices updates String adb = get_adb_path(); - if (ea->has_runnable_preset.is_set() && FileAccess::exists(adb)) { + // adb.exe was locking the editor_doc_cache file on startup. Adding a check for is_editor_ready provides just enough time + // to regenerate the doc cache. + if (ea->has_runnable_preset.is_set() && FileAccess::exists(adb) && EditorNode::get_singleton()->is_editor_ready()) { String devices; List<String> args; args.push_back("devices"); |