Commit df5c1aaa authored by Eric Gregory's avatar Eric Gregory

3842 orientation fixes for direct mode

Fixes not one but TWO cases where photos appear rotated in direct mode. One is a simple "stomping on values" problem, the other is a more subtle race condition that only appears if you click fast enough when Shotwell loads.
parent 5a317eac
......@@ -1161,7 +1161,7 @@ public abstract class Photo : PhotoSource, Dateable {
if (updated_row.master.original_orientation != backing.original_orientation) {
list += "image:orientation";
updated_row.orientation = backing.original_orientation;
updated_row.master.original_orientation = backing.original_orientation;
}
if (detected.metadata != null) {
......
......@@ -291,6 +291,13 @@ public class PixbufCache : Object {
Photo photo = (Photo) object;
if (in_progress.has_key(photo)) {
// Load is in progress, must cancel.
in_progress.get(photo).cancel();
in_progress.unset(photo);
continue;
}
// only interested if in this cache
if (!cache.has_key(photo))
continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment