diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-16 23:17:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-16 23:17:54 +0100 |
| commit | 9402d2f9feaddae00012ee6c3da074097e15dd22 (patch) | |
| tree | 4b831ae4b5d97a2d76b044896549afdffdd87445 | |
| parent | 6201159a4787dc084e0a136648094625b1d160ca (diff) | |
| parent | c28da898797d4ee6d07e7e15865f7567d8813057 (diff) | |
Merge pull request #25954 from AlexHolly/fix-android-jarsigner-duplicate-file
Fix Android jarsigner error duplicate file
| -rw-r--r-- | editor/editor_export.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index 4e8b2c82f1..39e6df4450 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -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); } |