diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-06-06 22:06:58 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-06-06 22:06:58 -0300 |
| commit | b524b40fdc5325c840192ce92dbed8108ccef2d9 (patch) | |
| tree | ec7f74db082b4b91f7614ed4391c53bc73b60bfd /tools/editor/editor_file_dialog.cpp | |
| parent | 14c4c1b568ffa40a179332fbc77e9b52c6bdf514 (diff) | |
-fixed many memory initialization issues
-fixed deadlock on previews thread
-fixed compilation errors on unix
Diffstat (limited to 'tools/editor/editor_file_dialog.cpp')
| -rw-r--r-- | tools/editor/editor_file_dialog.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp index e3508e4493..b1bbd71f7b 100644 --- a/tools/editor/editor_file_dialog.cpp +++ b/tools/editor/editor_file_dialog.cpp @@ -348,7 +348,6 @@ void EditorFileDialog::_push_history() { } } - void EditorFileDialog::_item_dc_selected(int p_item) { @@ -672,7 +671,7 @@ void EditorFileDialog::set_current_dir(const String& p_dir) { dir_access->change_dir(p_dir); update_dir(); invalidate(); - _push_history(); + //_push_history(); } @@ -852,8 +851,8 @@ void EditorFileDialog::_favorite_move_up(){ if (current>0 && current<favorites->get_item_count()) { Vector<String> favorited = EditorSettings::get_singleton()->get_favorite_dirs(); - int a_idx=favorited.find(favorites->get_item_metadata(current-1)); - int b_idx=favorited.find(favorites->get_item_metadata(current)); + int a_idx=favorited.find(String(favorites->get_item_metadata(current-1))); + int b_idx=favorited.find(String(favorites->get_item_metadata(current))); if (a_idx==-1 || b_idx==-1) return; @@ -873,8 +872,8 @@ void EditorFileDialog::_favorite_move_down(){ if (current>=0 && current<favorites->get_item_count()-1) { Vector<String> favorited = EditorSettings::get_singleton()->get_favorite_dirs(); - int a_idx=favorited.find(favorites->get_item_metadata(current+1)); - int b_idx=favorited.find(favorites->get_item_metadata(current)); + int a_idx=favorited.find(String(favorites->get_item_metadata(current+1))); + int b_idx=favorited.find(String(favorites->get_item_metadata(current))); if (a_idx==-1 || b_idx==-1) return; @@ -1143,6 +1142,7 @@ EditorFileDialog::EditorFileDialog() { show_hidden_files=true; display_mode=DISPLAY_THUMBNAILS; + local_history_pos=0; VBoxContainer *vbc = memnew( VBoxContainer ); add_child(vbc); |