From e63de52bdba895266726b988d8158cfb573bc8b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 5 Mar 2024 14:37:15 +0100 Subject: [PATCH] Check if DisplayServer supports icons before attempting setting it --- doc/classes/DisplayServer.xml | 2 ++ main/main.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/classes/DisplayServer.xml b/doc/classes/DisplayServer.xml index d3c76737db0..5e8f5b540a5 100644 --- a/doc/classes/DisplayServer.xml +++ b/doc/classes/DisplayServer.xml @@ -1148,6 +1148,7 @@ Sets the window icon (usually displayed in the top-left corner) with an [Image]. To use icons in the operating system's native format, use [method set_native_icon] instead. + [b]Note:[/b] Requires support for [constant FEATURE_ICON]. @@ -1155,6 +1156,7 @@ Sets the window icon (usually displayed in the top-left corner) in the operating system's [i]native[/i] format. The file at [param filename] must be in [code].ico[/code] format on Windows or [code].icns[/code] on macOS. By using specially crafted [code].ico[/code] or [code].icns[/code] icons, [method set_native_icon] allows specifying different icons depending on the size the icon is displayed at. This size is determined by the operating system and user preferences (including the display scale factor). To use icons in other formats, use [method set_icon] instead. + [b]Note:[/b] Requires support for [constant FEATURE_NATIVE_ICON]. diff --git a/main/main.cpp b/main/main.cpp index 91ccbe67667..ec66d479010 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -2885,7 +2885,7 @@ Error Main::setup2() { } #if defined(TOOLS_ENABLED) && defined(MACOS_ENABLED) - if (OS::get_singleton()->get_bundle_icon_path().is_empty()) { + if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_ICON) && OS::get_singleton()->get_bundle_icon_path().is_empty()) { Ref icon = memnew(Image(app_icon_png)); DisplayServer::get_singleton()->set_icon(icon); } @@ -3802,7 +3802,7 @@ bool Main::start() { #ifdef MACOS_ENABLED String mac_icon_path = GLOBAL_GET("application/config/macos_native_icon"); - if (!mac_icon_path.is_empty()) { + if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_ICON) && !mac_icon_path.is_empty()) { DisplayServer::get_singleton()->set_native_icon(mac_icon_path); has_icon = true; } @@ -3810,14 +3810,14 @@ bool Main::start() { #ifdef WINDOWS_ENABLED String win_icon_path = GLOBAL_GET("application/config/windows_native_icon"); - if (!win_icon_path.is_empty()) { + if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_NATIVE_ICON) && !win_icon_path.is_empty()) { DisplayServer::get_singleton()->set_native_icon(win_icon_path); has_icon = true; } #endif String icon_path = GLOBAL_GET("application/config/icon"); - if ((!icon_path.is_empty()) && (!has_icon)) { + if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_ICON) && !icon_path.is_empty() && !has_icon) { Ref icon; icon.instantiate(); if (ImageLoader::load_image(icon_path, icon) == OK) { @@ -3850,7 +3850,7 @@ bool Main::start() { #endif } - if (!has_icon && OS::get_singleton()->get_bundle_icon_path().is_empty()) { + if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_ICON) && !has_icon && OS::get_singleton()->get_bundle_icon_path().is_empty()) { Ref icon = memnew(Image(app_icon_png)); DisplayServer::get_singleton()->set_icon(icon); }