[nautilus/wip/csoriano/next-18: 11/13] files-view: don't remove model when stoping view



commit 45eebc268768e8f4a1b14a714a69056b16c6daa2
Author: Carlos Soriano <csoriano gnome org>
Date:   Wed Jan 13 20:33:07 2016 +0100

    files-view: don't remove model when stoping view
    
    So when searching, window-slot is able to get the location.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=759717

 src/nautilus-files-view.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index bb98091..a35a821 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -2818,6 +2818,11 @@ nautilus_files_view_destroy (GtkWidget *object)
         view->details->in_destruction = TRUE;
         nautilus_files_view_stop_loading (view);
 
+        if (view->details->model) {
+                nautilus_directory_unref (view->details->model);
+                view->details->model = NULL;
+        }
+
         for (node = view->details->scripts_directory_list; node != NULL; node = next) {
                 next = node->next;
                 remove_directory_from_scripts_directory_list (view, node->data);
@@ -7215,10 +7220,6 @@ nautilus_files_view_stop_loading (NautilusFilesView *view)
         done_loading (view, FALSE);
 
         disconnect_model_handlers (view);
-        if (view->details->model) {
-                nautilus_directory_unref (view->details->model);
-                view->details->model = NULL;
-        }
 }
 
 gboolean


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]