godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-12 13:20:55 +00:00
Code Releases Wiki Activity

Merge pull request #48686 from bruvzg/bundle_icon_3

Browse Source
This commit is contained in:
Rémi Verschelde
2021-09-30 14:55:41 +02:00
committed by GitHub
parent 0a7c6c0f1d 3b0c071ce2
commit 7c9e06f936
5 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/main.cpp
View File

@@ -1394,8 +1394,10 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
}
#ifdef TOOLS_ENABLED
Ref<Image> icon = memnew(Image(app_icon_png));
OS::get_singleton()->set_icon(icon);
if (OS::get_singleton()->get_bundle_icon_path().empty()) {
Ref<Image> icon = memnew(Image(app_icon_png));
OS::get_singleton()->set_icon(icon);
}
#endif
}
@@ -2043,7 +2045,7 @@ bool Main::start() {
#endif
}
if (!hasicon) {
if (!hasicon && OS::get_singleton()->get_bundle_icon_path().empty()) {
Ref<Image> icon = memnew(Image(app_icon_png));
OS::get_singleton()->set_icon(icon);
}