summaryrefslogtreecommitdiff
path: root/src/direct/DirectPhotoPage.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/direct/DirectPhotoPage.vala
parent1c99a41a296cda6647edc32437a813f6923cb1d0 (diff)
parent4e10e30c2f99d552239871aa1b27a08a6c18f1a4 (diff)
Merge tag 'upstream/0.23.1'
Upstream version 0.23.1
Diffstat (limited to 'src/direct/DirectPhotoPage.vala')
-rw-r--r--src/direct/DirectPhotoPage.vala16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
index 58d82fc..3d23528 100644
--- a/src/direct/DirectPhotoPage.vala
+++ b/src/direct/DirectPhotoPage.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
*
* This software is licensed under the GNU Lesser General Public License
* (version 2.1 or later). See the COPYING file in this distribution.
@@ -242,7 +242,12 @@ public class DirectPhotoPage : EditingHostPage {
DirectPhoto? photo = DirectPhoto.global.get_file_source(initial_file);
- display_mirror_of(view_controller, photo);
+ if (photo != null) {
+ display_mirror_of(view_controller, photo);
+ } else {
+ AppWindow.panic(_("Unable open photo %s. Sorry.").printf(initial_file.get_path()));
+ }
+
initial_file = null;
}
@@ -406,7 +411,12 @@ public class DirectPhotoPage : EditingHostPage {
base.update_actions(selected_count, count);
}
- private bool check_ok_to_close_photo(Photo photo) {
+ private bool check_ok_to_close_photo(Photo? photo) {
+ // Means we failed to load the photo for some reason. Do not block
+ // shutdown
+ if (photo == null)
+ return true;
+
if (!photo.has_alterations())
return true;