summaryrefslogtreecommitdiff
path: root/src/Photo.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-06-05 04:23:52 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-06-05 04:23:52 +0200
commitbec5f87053759705fb77bae1aa378f2666c7d153 (patch)
treebd955b9777aa39b207fa161edf19a6609f822909 /src/Photo.vala
parent1c99a41a296cda6647edc32437a813f6923cb1d0 (diff)
parent4e10e30c2f99d552239871aa1b27a08a6c18f1a4 (diff)
Merge tag 'upstream/0.23.1'
Upstream version 0.23.1
Diffstat (limited to 'src/Photo.vala')
-rw-r--r--src/Photo.vala11
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());