summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Riemann <friemann@gnome.org>2009-08-25 20:00:21 +0200
committerFelix Riemann <friemann@gnome.org>2009-08-25 20:03:38 +0200
commit881fa5a4ad4f9ecd7a6d0f5415f063086813a614 (patch)
tree3f70030168defdce4491bb1b4274f7777056e10e
parent3c501d254c968bcd955194a6881c7b5bb8868c34 (diff)
downloadeog-881fa5a4ad4f9ecd7a6d0f5415f063086813a614.tar.gz
Don't try to autorotate before the metadata was loaded
Autorotation would fail in that case. As it is only performed once for each image a simple image dimension query could prevent autorotation entirely for an image. Fixes bgo#592945. Closes: http://bugzilla.gnome.org/show_bug.cgi?id=592945
-rw-r--r--src/eog-image.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/eog-image.c b/src/eog-image.c
index 6c56123f..cb60f767 100644
--- a/src/eog-image.c
+++ b/src/eog-image.c
@@ -1165,7 +1165,10 @@ eog_image_load (EogImage *img, EogImageData data2read, EogJob *job, GError **err
success = eog_image_real_load (img, data2read, job, error);
#ifdef HAVE_EXIF
- if (priv->autorotate) {
+ /* Check that the metadata was loaded at least once before
+ * trying to autorotate. */
+ if (priv->autorotate &&
+ priv->metadata_status == EOG_IMAGE_METADATA_READY) {
eog_image_real_autorotate (img);
}
#endif