path: root/src/eom-image.c
diff options
authorinfirit <[email protected]>2014-07-25 16:07:16 +0200
committerinfirit <[email protected]>2014-07-25 16:07:16 +0200
commit4d498a1cc3a0bff55af99d5cde87343b0df011a0 (patch)
tree31258f5c1c92cce2781946009d02b158ce4a484a /src/eom-image.c
parent4c546d7e8754f291990a1d95363a88cd3d96c3ce (diff)
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 Based on eog commit 46b027696fd73c115efe6d13421105750a0bf86c From Felix Riemann <[email protected]>
Diffstat (limited to 'src/eom-image.c')
1 files changed, 4 insertions, 2 deletions
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);