northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix order of operations for macOS template check

Browse Source 
Backport for 3.x from PR: #84990
Co-authored-by: brno32 <drozdster@gmail.com>
This commit is contained in:
kilian-diener
2025-07-24 13:41:25 +02:00
parent 17b5769d56
commit 983b12b1fa
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
platform/osx/export/export.cpp
View File

@ -1910,9 +1910,9 @@ bool EditorExportPlatformOSX::has_valid_export_configuration(const Ref<EditorExp
String err; String err;
bool valid = false; bool valid = false;
// Look for export templates (custom templates). // Look for export templates (official templates first, then custom).
bool dvalid = false; bool dvalid = exists_export_template("osx.zip", &err);
bool rvalid = false; bool rvalid = dvalid; // Both in the same ZIP.
if (p_preset->get("custom_template/debug") != "") { if (p_preset->get("custom_template/debug") != "") {
dvalid = FileAccess::exists(p_preset->get("custom_template/debug")); dvalid = FileAccess::exists(p_preset->get("custom_template/debug"));
@ -1927,12 +1927,6 @@ bool EditorExportPlatformOSX::has_valid_export_configuration(const Ref<EditorExp
} }
} }
// Look for export templates (official templates, check only is custom templates are not set).
if (!dvalid || !rvalid) {
dvalid = exists_export_template("osx.zip", &err);
rvalid = dvalid; // Both in the same ZIP.
}
valid = dvalid || rvalid; valid = dvalid || rvalid;
r_missing_templates = !valid; r_missing_templates = !valid;