diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2016-02-01 12:45:44 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2016-02-02 22:22:38 +0100 |
| commit | 6444e9d3187f9d61489af0504963027478ec226b (patch) | |
| tree | 79520f56abeb23ecca3db7e3a848bd493f162d39 | |
| parent | 267b6b03fb59d106ee4fef76a47c880b2f9e1ad7 (diff) | |
| download | nautilus-6444e9d3187f9d61489af0504963027478ec226b.tar.gz | |
files-view: don't remove floating bar in an idle
If the view is still loading.
This happens when we schedule an idle to update the selection info
to display it in the floating bar, but selection becomes null.
Then the idle callback will remove the floating bar because the status
is none.
But that is wrong, because the floating bar is used for more than to
display the selection. We use it for displaying whether the view is
loading or searching, so if that happens we were removing the floating
bar.
To fix it, check in the idle callback for the other use case of the
floating bar, that means if it's still loading, and do nothing in that
case since that is taken care in a different code path.
| -rw-r--r-- | src/nautilus-files-view.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index e6058b0e9..cb892747d 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -458,8 +458,12 @@ real_floating_bar_set_short_status (NautilusFilesView *view, { gboolean disable_chrome; + if (view->details->loading) + return; + nautilus_floating_bar_cleanup_actions (NAUTILUS_FLOATING_BAR (view->details->floating_bar)); - nautilus_floating_bar_set_show_spinner (NAUTILUS_FLOATING_BAR (view->details->floating_bar), view->details->loading); + nautilus_floating_bar_set_show_spinner (NAUTILUS_FLOATING_BAR (view->details->floating_bar), + FALSE); g_object_get (nautilus_files_view_get_window (view), "disable-chrome", &disable_chrome, |