Merge tag 'upstream/0.23.1'

Upstream version 0.23.1

1 files changed, 9 insertions, 2 deletions

diff --git a/src/Photo.vala b/src/Photo.vala
index 2f2b7a5..11dbae6 100644
--- a/src/Photo.vala
+++ b/src/Photo.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU LGPL (version 2.1 or later).
  * See the COPYING file in this distribution.
@@ -4079,7 +4079,14 @@ public abstract class Photo : PhotoSource, Dateable {
     private void on_editable_file_changed(File file, File? other_file, FileMonitorEvent event) {
         // This has some expense, but this assertion is important for a lot of sanity reasons.
         lock (readers) {
-            assert(readers.editable != null && file.equal(readers.editable.get_file()));
+            assert(readers.editable != null);
+
+            if (!file.equal(readers.editable.get_file())) {
+                // Ignore. When the export file is created, we receive a
+                // DELETE event for renaming temporary file created by exiv2 when
+                // writing meta-data.
+                return;
+            }
         }
         
         debug("EDITABLE %s: %s", event.to_string(), file.get_path());