godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11884 from Noshyaar/pr-fd2 

FileDialog: fix select index out of range

[ci skip]
This commit is contained in:
Rémi Verschelde 2017-10-09 12:45:00 +02:00 committed by GitHub
parent 321ae21d5f 5e67a3bca7
commit d989479744
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/gui/file_dialog.cpp
View File

@ -115,7 +115,9 @@ Vector<String> FileDialog::get_selected_files() const {
void FileDialog::update_dir() { void FileDialog::update_dir() {
dir->set_text(dir_access->get_current_dir()); dir->set_text(dir_access->get_current_dir());
drives->select(dir_access->get_current_drive()); if (drives->is_visible()) {
drives->select(dir_access->get_current_drive());
}
} }
void FileDialog::_dir_entered(String p_dir) { void FileDialog::_dir_entered(String p_dir) {
@ -667,7 +669,6 @@ void FileDialog::_update_drives() {
drives->show(); drives->show();
for (int i = 0; i < dir_access->get_drive_count(); i++) { for (int i = 0; i < dir_access->get_drive_count(); i++) {
String d = dir_access->get_drive(i);
drives->add_item(dir_access->get_drive(i)); drives->add_item(dir_access->get_drive(i));
} }