diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-11-01 12:45:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-01 12:45:08 +0100 |
commit | 584bc88834bb86e3e3fc76788a8412ac39acb3ad (patch) | |
tree | abcd3589f94225cb1060070d573049edef43d578 | |
parent | 58889102b6fe3a562e4f5e0cb045def9ff2b1f53 (diff) | |
parent | 93e8468d92ec639120c7e8502df7d5971bdc71b5 (diff) |
Merge pull request #12559 from Cradmon/filesystemDockFix
Fix to issue #12554, due to error in refactoring in PR #10261
-rw-r--r-- | editor/filesystem_dock.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 62d77f56bc..00cbd9bb72 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -595,10 +595,10 @@ void FileSystemDock::_select_file(int p_idx) { current_path->set_text(path); _push_to_history(); } else { - if (ResourceLoader::get_resource_type(path) == "PackedScene") { - editor->open_request(path); + if (ResourceLoader::get_resource_type(fpath) == "PackedScene") { + editor->open_request(fpath); } else { - editor->load_resource(path); + editor->load_resource(fpath); } } } |