New upstream version 0.26.0upstream/0.26.0

1 files changed, 9 insertions, 7 deletions

diff --git a/src/Photo.vala b/src/Photo.vala
index 222896f..c768017 100644
--- a/src/Photo.vala
+++ b/src/Photo.vala
@@ -813,12 +813,6 @@ public abstract class Photo : PhotoSource, Dateable {
             // Perform development, bail out if it doesn't work.
             if (!is_raw_developer_complete(d)) {
                 develop_photo(d);
-                try {
-                    get_prefetched_copy();
-                } catch (Error e) {
-                    // couldn't reload the freshly-developed image, nothing to display
-                    return;
-                }
             }
             if (!developments.has_key(d))
                 return; // we tried!
@@ -830,7 +824,14 @@ public abstract class Photo : PhotoSource, Dateable {
             row.developer = d;
             backing_photo_row = developments.get(d);
             readers.developer = backing_photo_row.file_format.create_reader(backing_photo_row.filepath);
-            
+
+            try {
+                get_prefetched_copy();
+            } catch (Error e) {
+                // couldn't reload the freshly-developed image, nothing to display
+                return;
+            }
+
             set_orientation(backing_photo_row.original_orientation);
             
             try {
@@ -1258,6 +1259,7 @@ public abstract class Photo : PhotoSource, Dateable {
         if (params.thumbnails != null) {
             PhotoFileReader reader = params.row.master.file_format.create_reader(
                 params.row.master.filepath);
+            reader.set_role (PhotoFileReader.Role.THUMBNAIL);
             try {
                 ThumbnailCache.generate_for_photo(params.thumbnails, reader, params.row.orientation, 
                     params.row.master.dim);