From 679e9f413c42bb3cc9cfafd98251d4f71d6030a4 Mon Sep 17 00:00:00 2001
From: volzhs <volzhs@gmail.com>
Date: Mon, 14 Nov 2016 08:36:01 +0900
Subject: [PATCH] Fix crash when select target path on import 3d scene window

(cherry picked from commit b0cf201ea3beb473fd0498c5c7ec3b98feda88b9)
---
 tools/editor/editor_dir_dialog.cpp                     | 2 +-
 tools/editor/io_plugins/editor_scene_import_plugin.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/editor/editor_dir_dialog.cpp b/tools/editor/editor_dir_dialog.cpp
index cf0732501e8..a6a6e111421 100644
--- a/tools/editor/editor_dir_dialog.cpp
+++ b/tools/editor/editor_dir_dialog.cpp
@@ -145,7 +145,7 @@ void EditorDirDialog::set_current_path(const String& p_path) {
 	if (p.begins_with("res://"))
 		p = p.replace_first("res://","");
 
-	Vector<String> dirs = p.split("/");
+	Vector<String> dirs = p.split("/",false);
 
 	TreeItem *r=tree->get_root();
 	for(int i=0;i<dirs.size();i++) {
diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
index c31acf51395..66c4adf9827 100644
--- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -894,9 +894,9 @@ void EditorSceneImportDialog::_browse() {
 
 void EditorSceneImportDialog::_browse_target() {
 
+	save_select->popup_centered_ratio();
 	if (save_path->get_text()!="")
 		save_select->set_current_path(save_path->get_text());
-	save_select->popup_centered_ratio();
 
 }