From 11ccfad1aabec468fd92e1b567f3f9d94b5acc4b Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Thu, 13 May 2021 09:25:09 +0300 Subject: [macOS] Prefer .app bundle icon over the default one. --- main/main.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'main/main.cpp') diff --git a/main/main.cpp b/main/main.cpp index 67d8d93728..61864290b3 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1696,8 +1696,10 @@ Error Main::setup2(Thread::ID p_main_tid_override) { } #ifdef TOOLS_ENABLED - Ref icon = memnew(Image(app_icon_png)); - DisplayServer::get_singleton()->set_icon(icon); + if (OS::get_singleton()->get_bundle_icon_path().is_empty()) { + Ref icon = memnew(Image(app_icon_png)); + DisplayServer::get_singleton()->set_icon(icon); + } #endif } @@ -2391,7 +2393,7 @@ bool Main::start() { #endif } - if (!hasicon) { + if (!hasicon && OS::get_singleton()->get_bundle_icon_path().is_empty()) { Ref icon = memnew(Image(app_icon_png)); DisplayServer::get_singleton()->set_icon(icon); } -- cgit v1.2.3