5 files changed, 26 insertions, 6 deletions
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 79f5e66401..39e848201a 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -2214,7 +2214,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 		case FILE_EXPORT_PROJECT: {
 
-			project_export_settings->popup_centered_ratio();
+			project_export_settings->popup_export();
 			/*
 			String target = export_db->get_current_platform();
 			Ref<EditorExporter> exporter = export_db->get_exporter(target);
diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp
index 7690d31e7b..164443d001 100644
--- a/tools/editor/project_export.cpp
+++ b/tools/editor/project_export.cpp
@@ -122,6 +122,15 @@ void ProjectExportDialog::_tree_changed() {
 
 }
 
+void ProjectExportDialog::popup_export() {
+	popup_centered_ratio();
+	if (pending_update_tree) {
+		_update_tree();
+		_update_group_tree();
+		pending_update_tree=false;
+	}
+}
+
 void ProjectExportDialog::_update_tree() {
 
 
@@ -168,6 +177,11 @@ void ProjectExportDialog::_scan_finished() {
 	print_line("**********SCAN DONEEE********");
 	print_line("**********SCAN DONEEE********");*/
 
+	if (!is_visible()) {
+		pending_update_tree=true;
+		return;
+	}
+
 	_update_tree();
 	_update_group_tree();
 }
@@ -1446,7 +1460,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
 
 	ei="EditorIcons";
 	ot="Object";
-
+	pending_update_tree=true;
 }
 
 
@@ -1480,6 +1494,8 @@ void ProjectExport::popup_export() {
 
 	popup_centered(Size2(300,100));
 
+
+
 }
 Error ProjectExport::export_project(const String& p_preset) {
 
@@ -1880,5 +1896,6 @@ ProjectExport::ProjectExport(EditorData* p_data) {
 	error = memnew( AcceptDialog );
 	add_child(error);
 
+
 }
 
diff --git a/tools/editor/project_export.h b/tools/editor/project_export.h
index 5a42a58e58..b9e49489e3 100644
--- a/tools/editor/project_export.h
+++ b/tools/editor/project_export.h
@@ -70,6 +70,7 @@ private:
 
 	TabContainer *sections;
 	bool updating_tree;
+	bool pending_update_tree;
 	AcceptDialog *error;
 	ConfirmationDialog *confirm;
 
@@ -203,6 +204,7 @@ public:
 
 	Error export_platform(const String& p_platform, const String& p_path, bool p_debug,const String& p_password,bool p_quit_after=false);
 
+	void popup_export();
 	ProjectExportDialog(EditorNode *p_editor);
 	~ProjectExportDialog();
 };
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index 4b1b93ea6e..3dfc461bfe 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -3701,9 +3701,7 @@ PropertyEditor::PropertyEditor() {
 
 	capitalize_paths=true;
 	autoclear=false;
-	tree->set_column_title(0,"Property");
-	tree->set_column_title(1,"Value");
-	tree->set_column_titles_visible(true);
+	tree->set_column_titles_visible(false);
 
 	keying=false;
 	read_only=false;
diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp
index 0260457c81..ba5cc7568b 100644
--- a/tools/editor/scene_tree_editor.cpp
+++ b/tools/editor/scene_tree_editor.cpp
@@ -658,6 +658,9 @@ void SceneTreeEditor::_renamed() {
 		new_name=n->get_name();
 	}
 
+	if (new_name==n->get_name())
+		return;
+
 	if (!undo_redo) {
 		n->set_name( new_name );
 		which->set_metadata(0,n->get_path());
@@ -844,7 +847,7 @@ SceneTreeEditor::SceneTreeEditor(bool p_label,bool p_can_rename, bool p_can_open
 	add_child( tree );
 		
 	tree->connect("cell_selected", this,"_selected_changed");
-	tree->connect("item_edited", this,"_renamed");
+	tree->connect("item_edited", this,"_renamed",varray(),CONNECT_DEFERRED);
 	tree->connect("multi_selected",this,"_cell_multi_selected");
 	tree->connect("button_pressed",this,"_cell_button_pressed");
 //	tree->connect("item_edited", this,"_renamed",Vector<Variant>(),true);