Merge pull request #8442 from volzhs/error-load-icon-2.1

Fix error for loading icon image at start up
This commit is contained in:
Rémi Verschelde 2017-04-18 00:07:09 +02:00 committed by GitHub
commit 6b0c384f79

View File

@ -1404,6 +1404,7 @@ bool Main::start() {
String iconpath = GLOBAL_DEF("application/icon", "Variant()");
if (iconpath != "") {
iconpath = PathRemap::get_singleton()->get_remap(iconpath);
Image icon;
if (icon.load(iconpath) == OK)
OS::get_singleton()->set_icon(icon);