summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-07-25 14:03:02 +0200
committerinfirit <[email protected]>2014-07-25 14:03:02 +0200
commit0a8d4be863cdd6315e929589a92b05264cb1d257 (patch)
tree108bef44c819dfa82b3b30d2e644bc6012cd092a
parent477065ee6778e48b5a3c11794deabbc49a97e3e0 (diff)
downloadeom-0a8d4be863cdd6315e929589a92b05264cb1d257.tar.bz2
eom-0a8d4be863cdd6315e929589a92b05264cb1d257.tar.xz
Don't create thumbnails out of outdated image pixbufs
Eog bug reff http://bugzilla.gnome.org/show_bug.cgi?id=614634 Based on eog commit 35ea437d25c94cbd7c0c61c7a4c3094a239048d8 From Claudio Saavedra <[email protected]>
-rw-r--r--src/eom-thumbnail.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/eom-thumbnail.c b/src/eom-thumbnail.c
index a98dd30..b7c5dc1 100644
--- a/src/eom-thumbnail.c
+++ b/src/eom-thumbnail.c
@@ -440,7 +440,7 @@ eom_thumbnail_load (EomImage *image, GError **error)
GdkPixbuf *thumb = NULL;
GFile *file;
EomThumbData *data;
- GdkPixbuf *pixbuf;
+ GdkPixbuf *pixbuf = NULL;
g_return_val_if_fail (image != NULL, NULL);
g_return_val_if_fail (error != NULL && *error == NULL, NULL);
@@ -465,7 +465,9 @@ eom_thumbnail_load (EomImage *image, GError **error)
if (thumb != NULL) {
eom_debug_message (DEBUG_THUMBNAIL, "%s: loaded from cache",data->uri_str);
} else if (mate_desktop_thumbnail_factory_can_thumbnail (factory, data->uri_str, data->mime_type, data->mtime)) {
- pixbuf = eom_image_get_pixbuf (image);
+ /* Only use the image pixbuf when it is up to date. */
+ if (!eom_image_is_file_changed (image))
+ pixbuf = eom_image_get_pixbuf (image);
if (pixbuf != NULL) {
/* generate a thumbnail from the in-memory image,