Commit 9eee3f58 authored by Jim Nelson's avatar Jim Nelson

Update displayed image after straighten: Bug #719120

When a straighten occurs, the displayed image was not updated.
parent 1c66a979
...@@ -795,8 +795,16 @@ public class StraightenCommand : GenericPhotoTransformationCommand { ...@@ -795,8 +795,16 @@ public class StraightenCommand : GenericPhotoTransformationCommand {
} }
public override void execute_on_photo(Photo photo) { public override void execute_on_photo(Photo photo) {
// thaw collection so both alterations are signalled at the same time
DataCollection? collection = photo.get_membership();
if (collection != null)
collection.freeze_notifications();
photo.set_straighten(theta); photo.set_straighten(theta);
photo.set_crop(crop); photo.set_crop(crop);
if (collection != null)
collection.thaw_notifications();
} }
} }
......
...@@ -265,6 +265,10 @@ public class PixbufCache : Object { ...@@ -265,6 +265,10 @@ public class PixbufCache : Object {
return; return;
} }
#if TRACE_PIXBUF_CACHE
debug("%s %s fetched into pixbuf cache", type.to_string(), job.photo.to_string());
#endif
encache(job.photo, job.pixbuf); encache(job.photo, job.pixbuf);
// fire signal // fire signal
...@@ -279,16 +283,14 @@ public class PixbufCache : Object { ...@@ -279,16 +283,14 @@ public class PixbufCache : Object {
Photo photo = (Photo) object; Photo photo = (Photo) object;
if (in_progress.has_key(photo)) { if (in_progress.has_key(photo)) {
// Load is in progress, must cancel. // Load is in progress, must cancel, but consider in-cache (since it was decached
// before being put into progress)
in_progress.get(photo).cancel(); in_progress.get(photo).cancel();
in_progress.unset(photo); in_progress.unset(photo);
} else if (!cache.has_key(photo)) {
continue; continue;
} }
// only interested if in this cache
if (!cache.has_key(photo))
continue;
decache(photo); decache(photo);
#if TRACE_PIXBUF_CACHE #if TRACE_PIXBUF_CACHE
......
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