From 7246e1488e3447fc80e37c5092cadd7f52423cd7 Mon Sep 17 00:00:00 2001 From: Hilderin <81109165+Hilderin@users.noreply.github.com> Date: Sat, 14 Sep 2024 09:37:04 -0400 Subject: [PATCH] Fix editor_doc_cache locked on editor startup (cherry picked from commit e064efccbc0c48576bc23087ba8fd0773d13714d) --- platform/android/export/export_plugin.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index 6a17dc8bf60..d5153fb6c04 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -290,7 +290,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 args; args.push_back("devices");