diff options
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/main/main.cpp b/main/main.cpp index 68c977e9b7..ef997e71a7 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -2562,7 +2562,7 @@ static MainTimerSync main_timer_sync; bool Main::start() { ERR_FAIL_COND_V(!_start_success, false); - bool hasicon = false; + bool has_icon = false; String positional_arg; String game_path; String script; @@ -3192,28 +3192,28 @@ bool Main::start() { sml->add_current_scene(scene); #ifdef MACOS_ENABLED - String mac_iconpath = GLOBAL_GET("application/config/macos_native_icon"); - if (!mac_iconpath.is_empty()) { - DisplayServer::get_singleton()->set_native_icon(mac_iconpath); - hasicon = true; + String mac_icon_path = GLOBAL_GET("application/config/macos_native_icon"); + if (!mac_icon_path.is_empty()) { + DisplayServer::get_singleton()->set_native_icon(mac_icon_path); + has_icon = true; } #endif #ifdef WINDOWS_ENABLED - String win_iconpath = GLOBAL_GET("application/config/windows_native_icon"); - if (!win_iconpath.is_empty()) { - DisplayServer::get_singleton()->set_native_icon(win_iconpath); - hasicon = true; + String win_icon_path = GLOBAL_GET("application/config/windows_native_icon"); + if (!win_icon_path.is_empty()) { + DisplayServer::get_singleton()->set_native_icon(win_icon_path); + has_icon = true; } #endif - String iconpath = GLOBAL_GET("application/config/icon"); - if ((!iconpath.is_empty()) && (!hasicon)) { + String icon_path = GLOBAL_GET("application/config/icon"); + if ((!icon_path.is_empty()) && (!has_icon)) { Ref<Image> icon; icon.instantiate(); - if (ImageLoader::load_image(iconpath, icon) == OK) { + if (ImageLoader::load_image(icon_path, icon) == OK) { DisplayServer::get_singleton()->set_icon(icon); - hasicon = true; + has_icon = true; } } } @@ -3241,7 +3241,7 @@ bool Main::start() { #endif } - if (!hasicon && OS::get_singleton()->get_bundle_icon_path().is_empty()) { + if (!has_icon && OS::get_singleton()->get_bundle_icon_path().is_empty()) { Ref<Image> icon = memnew(Image(app_icon_png)); DisplayServer::get_singleton()->set_icon(icon); } |