diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2016-03-16 14:05:16 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2016-03-17 14:07:11 +0100 |
| commit | 5cf3c789dc44e0c302a069cc25b120e017c0e24e (patch) | |
| tree | f603f83c2df224fa2cd250d4ea324434ee6ecec6 | |
| parent | 91f75b78bb251c4247d37b577b78ca2dc21c3a89 (diff) | |
| download | nautilus-5cf3c789dc44e0c302a069cc25b120e017c0e24e.tar.gz | |
files-view: don't select first file if pending selection
We want to select the first file only if not pending selection
was found. For example when returning from a folder we just entered.
https://bugzilla.gnome.org/show_bug.cgi?id=763746
| -rw-r--r-- | src/nautilus-files-view.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index fef1ce6fb..f0110d49c 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -3180,7 +3180,7 @@ done_loading (NautilusFilesView *view, selection = nautilus_view_get_selection (NAUTILUS_VIEW (view)); if (nautilus_view_is_searching (NAUTILUS_VIEW (view)) && - all_files_seen && !selection) { + all_files_seen && !selection && !pending_selection) { nautilus_files_view_select_first (view); do_reveal = TRUE; } else if (pending_selection != NULL && all_files_seen) { @@ -3656,9 +3656,12 @@ display_pending_files (NautilusFilesView *view) process_new_files (view); process_old_files (view); - if (!nautilus_files_view_get_selection (NAUTILUS_VIEW (view))) + if (!nautilus_files_view_get_selection (NAUTILUS_VIEW (view)) && + !view->details->pending_selection) { nautilus_files_view_select_first (view); + } + if (view->details->model != NULL && nautilus_directory_are_all_files_seen (view->details->model) && g_hash_table_size (view->details->non_ready_files) == 0) { |