Merge lp:~jeremywootten/pantheon-files/fix-1653748-crash-on-cut-paste into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fix a regression caused by r2421, which fails to perform a necessary null check.

This fixes a regression caused by r2421, which fails to perform a necessary null check.

[Kirill Romanov (djaler1)]

Works good

review: Approve (test)

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2016-12-31 19:42:09 +0000
+++ libcore/gof-directory-async.vala	2017-01-04 13:47:03 +0000
@@ -878,7 +878,10 @@
         bool found;
 
         foreach (var loc in files) {
-            assert (loc != null);
+            if (loc == null) {
+                continue;
+            }
+
             Async? dir = cache_lookup_parent (loc);
 
             if (dir != null) {
@@ -895,7 +898,9 @@
                     dirs.append (dir);
             } else {
                 dir = cache_lookup (loc);
-                dir.file_deleted (dir.file);
+                if (dir != null) {
+                    dir.file_deleted (dir.file);
+                }
             }
         }