Browse Source

Merge pull request #36230 from SkyLucilfer/iconBug

Fix script creation icon not showing at startup bug
Rémi Verschelde 5 years ago
parent
commit
53cf289f30
1 changed files with 3 additions and 8 deletions
  1. 3 8
      editor/script_create_dialog.cpp

+ 3 - 8
editor/script_create_dialog.cpp

@@ -52,10 +52,9 @@ void ScriptCreateDialog::_notification(int p_what) {
 					language_menu->set_item_icon(i, lang_icon);
 				}
 			}
+
 			String last_lang = EditorSettings::get_singleton()->get_project_metadata("script_setup", "last_selected_language", "");
-			Ref<Texture2D> last_lang_icon;
 			if (!last_lang.empty()) {
-
 				for (int i = 0; i < language_menu->get_item_count(); i++) {
 					if (language_menu->get_item_text(i) == last_lang) {
 						language_menu->select(i);
@@ -63,14 +62,10 @@ void ScriptCreateDialog::_notification(int p_what) {
 						break;
 					}
 				}
-
-				last_lang_icon = get_icon(last_lang, "EditorIcons");
 			} else {
-				last_lang_icon = language_menu->get_item_icon(default_language);
-			}
-			if (last_lang_icon.is_valid()) {
-				language_menu->set_icon(last_lang_icon);
+				language_menu->select(default_language);
 			}
+
 			path_button->set_icon(get_icon("Folder", "EditorIcons"));
 			parent_browse_button->set_icon(get_icon("Folder", "EditorIcons"));
 			parent_search_button->set_icon(get_icon("ClassList", "EditorIcons"));