Skip to content

Commit 7acb61d

Browse files
committed
Android Editor: Disable file reimport when .import changes
This is disabling the logic added in #84974 which caused #94416. That issue still needs to be debugged further, but this works around the regression and should have minimal usability impact on Android.
1 parent 77e18da commit 7acb61d

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

editor/editor_file_system.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -722,12 +722,16 @@ bool EditorFileSystem::_update_scan_actions() {
722722
String full_path = ia.dir->get_file_path(idx);
723723

724724
bool need_reimport = _test_for_reimport(full_path, false);
725+
// Workaround GH-94416 for the Android editor for now.
726+
// `import_mt` seems to always be 0 and force a reimport on any fs scan.
727+
#ifndef ANDROID_ENABLED
725728
if (!need_reimport && FileAccess::exists(full_path + ".import")) {
726729
uint64_t import_mt = ia.dir->get_file_import_modified_time(idx);
727730
if (import_mt != FileAccess::get_modified_time(full_path + ".import")) {
728731
need_reimport = true;
729732
}
730733
}
734+
#endif
731735

732736
if (need_reimport) {
733737
//must reimport

0 commit comments

Comments
 (0)