Merge pull request #8128 from volzhs/fix-android-app-name

Fix wrong app name for Android export
This commit is contained in:
Rémi Verschelde 2017-03-24 22:52:25 +01:00 committed by GitHub
commit 6674c556ae

View file

@ -2725,7 +2725,7 @@ class EditorExportAndroid : public EditorExportPlatform {
Vector<String> string_table;
String version_name = p_preset->get("version/name");
String package_name = p_preset->get("package/name");
//printf("stirng block len: %i\n",string_block_len);
//printf("stirng count: %i\n",string_count);
@ -2742,7 +2742,7 @@ class EditorExportAndroid : public EditorExportPlatform {
if (str == "godot-project-name") {
//project name
str = get_project_name(version_name);
str = get_project_name(package_name);
} else {
@ -2751,7 +2751,7 @@ class EditorExportAndroid : public EditorExportPlatform {
if (GlobalConfig::get_singleton()->has(prop)) {
str = GlobalConfig::get_singleton()->get(prop);
} else {
str = get_project_name(version_name);
str = get_project_name(package_name);
}
}
}