diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-05 13:43:07 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-06-05 13:43:07 +0200 |
| commit | d0dfc01035d15162d1140fda1d6c65acf2700c1f (patch) | |
| tree | 4367a4c32d575461435ad4ab02821e38414cf3e4 /platform/windows/export/export_plugin.cpp | |
| parent | 9d3d2ead6918db686ae8512e332590b976e4ce4c (diff) | |
| parent | 71d8882a025f8bc9e94173ba9a09849a8e5f7d31 (diff) | |
| download | redot-engine-d0dfc01035d15162d1140fda1d6c65acf2700c1f.tar.gz | |
Merge pull request #77821 from YeldhamDev/fallback!_fallback!_fallback!
Enhance icon fallback and their docs for exporters
Diffstat (limited to 'platform/windows/export/export_plugin.cpp')
| -rw-r--r-- | platform/windows/export/export_plugin.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/platform/windows/export/export_plugin.cpp b/platform/windows/export/export_plugin.cpp index ca390236fb..2ac41af3a2 100644 --- a/platform/windows/export/export_plugin.cpp +++ b/platform/windows/export/export_plugin.cpp @@ -399,7 +399,16 @@ Error EditorExportPlatformWindows::_rcedit_add_data(const Ref<EditorExportPreset } #endif - String icon_path = ProjectSettings::get_singleton()->globalize_path(p_preset->get("application/icon")); + String icon_path; + if (p_preset->get("application/icon") != "") { + icon_path = p_preset->get("application/icon"); + } else if (GLOBAL_GET("application/config/windows_native_icon") != "") { + icon_path = GLOBAL_GET("application/config/windows_native_icon"); + } else { + icon_path = GLOBAL_GET("application/config/icon"); + } + icon_path = ProjectSettings::get_singleton()->globalize_path(icon_path); + if (p_console_icon) { String console_icon_path = ProjectSettings::get_singleton()->globalize_path(p_preset->get("application/console_wrapper_icon")); if (!console_icon_path.is_empty() && FileAccess::exists(console_icon_path)) { |