Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix editor_doc_cache locked by adb process on editor startup #97000

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion platform/android/export/export_plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Loading