diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-21 10:28:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-21 10:28:05 +0200 |
| commit | f22f83f2df827175a79f5f8a48fdec9e3352d759 (patch) | |
| tree | d0d3038376c2bb5ad2b522718badafe636050740 | |
| parent | d26c6b28a679861068f44ab9147cc26429f2a0de (diff) | |
| parent | 77a6a467b357798cdd7567076de5bca89a481e34 (diff) | |
Merge pull request #22308 from groud/fix_filesystem_setting
Fixes filesystem display mode not updating at startup
| -rw-r--r-- | editor/filesystem_dock.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 194cbd4e80..d8925630b1 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -314,10 +314,11 @@ void FileSystemDock::_notification(int p_what) { button_tree->connect("pressed", this, "_go_to_tree", varray(), CONNECT_DEFERRED); current_path->connect("text_entered", this, "navigate_to_path"); - _update_display_mode(); - + display_mode_setting = DisplayModeSetting(int(EditorSettings::get_singleton()->get("docks/filesystem/display_mode"))); always_show_folders = bool(EditorSettings::get_singleton()->get("docks/filesystem/always_show_folders")); + _update_display_mode(); + if (EditorFileSystem::get_singleton()->is_scanning()) { _set_scanning_mode(); } else { |