1 files changed, 18 insertions, 1 deletions
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);
 
+
 }