diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-30 14:55:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 14:55:04 +0200 |
| commit | 3a19400889d518e35e69087588195328bcda9f8e (patch) | |
| tree | 5c5eada331f5a8639d043e9dd53e699792c8534a /main/main.cpp | |
| parent | 998974fd7af6e720cb00898071d3050f7e019ccb (diff) | |
| parent | 11ccfad1aabec468fd92e1b567f3f9d94b5acc4b (diff) | |
Merge pull request #48685 from bruvzg/bundle_icon_4
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/main/main.cpp b/main/main.cpp index d512c41e7a..7d7c9d7374 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1721,8 +1721,10 @@ Error Main::setup2(Thread::ID p_main_tid_override) { } #ifdef TOOLS_ENABLED - Ref<Image> icon = memnew(Image(app_icon_png)); - DisplayServer::get_singleton()->set_icon(icon); + if (OS::get_singleton()->get_bundle_icon_path().is_empty()) { + Ref<Image> icon = memnew(Image(app_icon_png)); + DisplayServer::get_singleton()->set_icon(icon); + } #endif } @@ -2440,7 +2442,7 @@ bool Main::start() { #endif } - if (!hasicon) { + if (!hasicon && OS::get_singleton()->get_bundle_icon_path().is_empty()) { Ref<Image> icon = memnew(Image(app_icon_png)); DisplayServer::get_singleton()->set_icon(icon); } |