asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #11299 from marcelofg55/fix_seticon_default

Browse source 
Fix setting the default icon briefly with tools=no
This commit is contained in:
Rémi Verschelde 2017-09-21 10:30:36 +02:00 committed by GitHub
commit ffec7cf193
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
main/main.cpp
View file

@ -990,8 +990,10 @@ Error Main::setup2(Thread::ID p_main_tid_override) {
#endif
}
#ifdef TOOLS_ENABLED
Ref<Image> icon = memnew(Image(app_icon_png));
OS::get_singleton()->set_icon(icon);
#endif
}
MAIN_PRINT("Main: DCC");
@ -1082,6 +1084,7 @@ bool Main::start() {
ERR_FAIL_COND_V(!_start_success, false);
bool hasicon = false;
bool editor = false;
String doc_tool;
List<String> removal_docs;
@ -1519,8 +1522,10 @@ bool Main::start() {
if (iconpath != "") {
Ref<Image> icon;
icon.instance();
if (icon->load(iconpath) == OK)
if (icon->load(iconpath) == OK) {
OS::get_singleton()->set_icon(icon);
hasicon = true;
}
}
}
}
@ -1537,6 +1542,11 @@ bool Main::start() {
#endif
}
if (!hasicon) {
Ref<Image> icon = memnew(Image(app_icon_png));
OS::get_singleton()->set_icon(icon);
}
OS::get_singleton()->set_main_loop(main_loop);
return true;