Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-10 21:01:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #25954 from AlexHolly/fix-android-jarsigner-duplicate-file

Browse Source 
Fix Android jarsigner error duplicate file
This commit is contained in:
Rémi Verschelde 2019-02-16 23:17:54 +01:00 committed by GitHub
commit 9402d2f9fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_export.cpp
View File

@ -858,7 +858,7 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &
Vector<uint8_t> array = FileAccess::get_file_as_array(icon);
p_func(p_udata, icon, array, idx, total);
}
if (splash != String() && FileAccess::exists(splash)) {
if (splash != String() && FileAccess::exists(splash) && icon != splash) {
Vector<uint8_t> array = FileAccess::get_file_as_array(splash);
p_func(p_udata, splash, array, idx, total);
}