godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Rémi Verschelde 2024-09-16 13:35:46 +02:00
parent e516b059e0 e064efccbc
commit f91c1a7b88
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/android/export/export_plugin.cpp
View File

@ -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");