浏览代码

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
Rémi Verschelde 1 年之前
父节点
当前提交
f91c1a7b88
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      platform/android/export/export_plugin.cpp

+ 3 - 1
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");