Merge lp:~jeremywootten/pantheon-files/fix-1665620-crash-on-reload-close-tab into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Add toggle ref to the GOFDirectoryAsync on creation instead of after initialization, preventing a crash introduced in r2474

This branch fixes regression caused by r2474. The toggle ref is added to the GOFDirectoryAsync on creation instead of after initialization (as before r2474) so only one toggle can be added, even if the view is reloaded.

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2017-02-12 10:29:05 +0000
+++ libcore/gof-directory-async.vala	2017-02-17 12:46:35 +0000
@@ -145,6 +145,9 @@
         cancellable.cancel ();
         cancellable = new Cancellable ();
 
+        this.add_toggle_ref ((ToggleNotify) toggle_ref_notify);
+        this.unref ();
+
         /* If we already have a loaded file cache just list them */ 
         if (previous_state == State.LOADED) {
             list_cached_files (file_loaded_func);
@@ -358,9 +361,6 @@
             directory_cache.insert (location.dup (), this);
             dir_cache_lock.unlock ();
 
-            this.add_toggle_ref ((ToggleNotify) toggle_ref_notify);
-            this.unref ();
-
             is_ready = true;
             yield list_directory_async (file_loaded_func);