[shotwell] Get prefetched copy after setting the developer
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell] Get prefetched copy after setting the developer
- Date: Sat, 25 Feb 2017 21:26:05 +0000 (UTC)
commit da83d231f6efe00e2bea5ccc7d1a5fbab8a20749
Author: Jens Georg <mail jensge org>
Date: Wed Oct 12 16:20:09 2016 +0200
Get prefetched copy after setting the developer
Avoid doing a raw development if we want the embedded developer
Signed-off-by: Jens Georg <mail jensge org>
src/Photo.vala | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/Photo.vala b/src/Photo.vala
index a718b19..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 {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]