Fix main scene not being saved when set via Play button

Fixes #1134 for real. Also tweaked the engine.cfg template
and the preference order when browsing for the main scene.

2 files changed, 5 insertions, 2 deletions

diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index dee521beb3..d843b6ef6a 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -1175,6 +1175,8 @@ void EditorNode::_dialog_action(String p_file) {
 		case SETTINGS_PICK_MAIN_SCENE: {
 
 			Globals::get_singleton()->set("application/main_scene",p_file);
+			Globals::get_singleton()->set_persisting("application/main_scene",true);
+			Globals::get_singleton()->save();
 			//would be nice to show the project manager opened with the hilighted field..
 		} break;
 		case FILE_SAVE_OPTIMIZED: {
diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp
index 52c8ca4d6c..b7d3abfd5b 100644
--- a/tools/editor/project_manager.cpp
+++ b/tools/editor/project_manager.cpp
@@ -203,14 +203,15 @@ private:
 				} else {
 
 					f->store_line("; Engine configuration file.");
-					f->store_line("; It's best to edit using the editor UI, not directly,");
-					f->store_line("; becausethe parameters that go here are not obvious.");
+					f->store_line("; It's best edited using the editor UI and not directly,");
+					f->store_line("; since the parameters that go here are not all obvious.");
 					f->store_line("; ");
 					f->store_line("; Format: ");
 					f->store_line(";   [section] ; section goes between []");
 					f->store_line(";   param=value ; assign values to parameters");
 					f->store_line("\n");
 					f->store_line("[application]");
+					f->store_line("\n");
 					f->store_line("name=\""+project_name->get_text()+"\"");
 					f->store_line("icon=\"res://icon.png\"");