diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-10-05 15:34:34 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-10-05 15:34:34 -0300 |
| commit | 3d87b70f7a8cadaab581c481fcc51622e8043ee0 (patch) | |
| tree | 0dcf539804decaf77f74086774a32c64872e7c11 /platform | |
| parent | 928efe06d672d8afeb595f75878746a51e4dc2ce (diff) | |
Added the set/get_setting function in Editor/Project settings. Renamed has() to has_setting. Fixes #11844
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/export/export.cpp | 2 | ||||
| -rw-r--r-- | platform/android/java_glue.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index e3615e2298..9fe1f291d6 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -871,7 +871,7 @@ class EditorExportAndroid : public EditorExportPlatform { String lang = str.substr(str.find_last("-") + 1, str.length()).replace("-", "_"); String prop = "application/config/name_" + lang; - if (ProjectSettings::get_singleton()->has(prop)) { + if (ProjectSettings::get_singleton()->has_setting(prop)) { str = ProjectSettings::get_singleton()->get(prop); } else { str = get_project_name(package_name); diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index f44b11ff63..6819a7e20f 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -853,7 +853,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv *en static void _initialize_java_modules() { - if (!ProjectSettings::get_singleton()->has("android/modules")) { + if (!ProjectSettings::get_singleton()->has_setting("android/modules")) { print_line("ANDROID MODULES: Nothing to load, aborting"); return; } |