Merge branch 'master' of https://github.com/godotengine/godot

1 files changed, 13 insertions, 1 deletions

diff --git a/tools/editor/script_create_dialog.cpp b/tools/editor/script_create_dialog.cpp
index 749198314a..62d5c7cd84 100644
--- a/tools/editor/script_create_dialog.cpp
+++ b/tools/editor/script_create_dialog.cpp
@@ -121,6 +121,8 @@ void ScriptCreateDialog::ok_pressed() {
 	Ref<Script> scr = ScriptServer::get_language( language_menu->get_selected() )->get_template(cname,parent_name->get_text());
 	//scr->set_source_code(text);
 
+	String selected_language = language_menu->get_item_text(language_menu->get_selected());
+	editor_settings->set_last_selected_language(selected_language);
 
 	if (cname!="")
 		scr->set_name(cname);
@@ -330,7 +332,17 @@ ScriptCreateDialog::ScriptCreateDialog() {
 		language_menu->add_item(ScriptServer::get_language(i)->get_name());
 	}
 
-	language_menu->select(0);
+	editor_settings = EditorSettings::get_singleton();
+	String last_selected_language = editor_settings->get_last_selected_language();
+	if (last_selected_language != "")
+		for (int i = 0; i < language_menu->get_item_count(); i++)
+			if (language_menu->get_item_text(i) == last_selected_language)
+			{
+				language_menu->select(i);
+				break;
+			}
+	else language_menu->select(0);
+
 	language_menu->connect("item_selected",this,"_lang_changed");
 
 	//parent_name->set_text();