summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-07-26 15:20:15 +0200
committerGitHub <noreply@github.com>2017-07-26 15:20:15 +0200
commit668f4f437f2b720373be8944c573fd9a0e07825d (patch)
tree6d325e57f275c44ce7bd6a85c1bb8383574a86da /core
parentccb17c2b279ec0dc6160f8d01d381b05e4c81fd3 (diff)
parent0154098531ce928fb573ff225e0f0886043c0b21 (diff)
Merge pull request #9873 from Noshyaar/pr-prop
Fix various property not found errors
Diffstat (limited to 'core')
-rw-r--r--core/io/resource_loader.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp
index 285cc6e3c2..9b89fa3399 100644
--- a/core/io/resource_loader.cpp
+++ b/core/io/resource_loader.cpp
@@ -430,6 +430,9 @@ void ResourceLoader::reload_translation_remaps() {
void ResourceLoader::load_translation_remaps() {
+ if (!ProjectSettings::get_singleton()->has("locale/translation_remaps"))
+ return;
+
Dictionary remaps = ProjectSettings::get_singleton()->get("locale/translation_remaps");
List<Variant> keys;
remaps.get_key_list(&keys);