From 4d498a1cc3a0bff55af99d5cde87343b0df011a0 Mon Sep 17 00:00:00 2001 From: infirit Date: Fri, 25 Jul 2014 16:07:16 +0200 Subject: Workaround concurrency issue with statusbar-date plugin Make sure that only an image loading job does autorotation. A metadata loading job has no use for this. Works around lost signals when the statusbar-date plugin is activated. Eog bug http://bugzilla.gnome.org/show_bug.cgi?id=622161 Based on eog commit 46b027696fd73c115efe6d13421105750a0bf86c From Felix Riemann --- src/eom-image.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/eom-image.c') diff --git a/src/eom-image.c b/src/eom-image.c index 724d849..1b38978 100644 --- a/src/eom-image.c +++ b/src/eom-image.c @@ -1253,9 +1253,11 @@ eom_image_load (EomImage *img, EomImageData data2read, EomJob *job, GError **err #ifdef HAVE_EXIF /* Check that the metadata was loaded at least once before - * trying to autorotate. */ + * trying to autorotate. Also only an imatge load job should try to + * autorotate and image */ if (priv->autorotate && - priv->metadata_status == EOM_IMAGE_METADATA_READY) { + priv->metadata_status == EOM_IMAGE_METADATA_READY && + data2read & EOM_IMAGE_DATA_IMAGE) { eom_image_real_autorotate (img); } #endif -- cgit v1.2.1