aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorbruvzg2018-01-23 19:49:50 +0200
committerHein-Pieter van Braam2018-06-13 11:57:40 +0000
commit518a6912312b73c26fc16a7ba71419d79a7a8fb5 (patch)
tree7dcb4da5e3643b62af9dfaaa40da2e4b9e592606 /core
parente8bfc09b81f02395226a06f5a8ecd47bea136cc6 (diff)
downloadgodot-518a6912312b73c26fc16a7ba71419d79a7a8fb5.tar.gz
godot-518a6912312b73c26fc16a7ba71419d79a7a8fb5.tar.zst
godot-518a6912312b73c26fc16a7ba71419d79a7a8fb5.zip
Mono: Allow loading `mscorlib` from resources.
(cherry picked from commit b3ddf12fb1774d63ac47a8d9890bf017b67d879e)
Diffstat (limited to 'core')
-rw-r--r--core/os/file_access.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp
index 368b4ad09..033b4b12b 100644
--- a/core/os/file_access.cpp
+++ b/core/os/file_access.cpp
@@ -479,6 +479,9 @@ void FileAccess::store_double(double p_dest) {
uint64_t FileAccess::get_modified_time(const String &p_file) {
+ if (PackedData::get_singleton() && !PackedData::get_singleton()->is_disabled() && PackedData::get_singleton()->has_path(p_file))
+ return 0;
+
FileAccess *fa = create_for_path(p_file);
ERR_FAIL_COND_V(!fa, 0);