From aa935c262a6730af24d4b1642bda05f30cb5c5de Mon Sep 17 00:00:00 2001 From: PouleyKetchoupp Date: Mon, 1 Jun 2020 23:13:31 +0200 Subject: [PATCH] Fix inconsistent error messages with Android custom export templates (cherry picked from commit be22a1f9bcf70f74ab7005bf1e58ff1c877d0cbc) --- platform/android/export/export.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 14562829445..7c3680f8ad5 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1788,23 +1788,32 @@ public: // Look for export templates (first official, and if defined custom templates). if (!bool(p_preset->get("custom_template/use_custom_build"))) { - bool dvalid = exists_export_template("android_debug.apk", &err); - bool rvalid = exists_export_template("android_release.apk", &err); + String template_err; + bool dvalid = false; + bool rvalid = false; if (p_preset->get("custom_template/debug") != "") { dvalid = FileAccess::exists(p_preset->get("custom_template/debug")); if (!dvalid) { - err += TTR("Custom debug template not found.") + "\n"; + template_err += TTR("Custom debug template not found.") + "\n"; } + } else { + dvalid = exists_export_template("android_debug.apk", &template_err); } + if (p_preset->get("custom_template/release") != "") { rvalid = FileAccess::exists(p_preset->get("custom_template/release")); if (!rvalid) { - err += TTR("Custom release template not found.") + "\n"; + template_err += TTR("Custom release template not found.") + "\n"; } + } else { + rvalid = exists_export_template("android_release.apk", &template_err); } valid = dvalid || rvalid; + if (!valid) { + err += template_err; + } } else { valid = exists_export_template("android_source.zip", &err); }