From 566dc060676b41e1e58a446b7dcc4159e242fee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Tue, 23 Sep 2014 09:36:45 +0200
Subject: Imported Upstream version 0.20.0

---
 src/direct/DirectPhotoPage.vala | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/direct/DirectPhotoPage.vala')

diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
index b2e130d..4dfd520 100644
--- a/src/direct/DirectPhotoPage.vala
+++ b/src/direct/DirectPhotoPage.vala
@@ -559,8 +559,15 @@ public class DirectPhotoPage : EditingHostPage {
     }
     
     private void on_dphoto_can_rotate_changed(bool should_allow_rotation) {
-        enable_rotate(should_allow_rotation);
-    }   
+        // since this signal handler can be called from a background thread (gah, don't get me
+        // started...), chain to the "enable-rotate" signal in the foreground thread, as it's
+        // tied to UI elements
+        Idle.add(() => {
+            enable_rotate(should_allow_rotation);
+            
+            return false;
+        });
+    }
     
     protected override DataView create_photo_view(DataSource source) {
         return new DirectView((DirectPhoto) source);
-- 
cgit v1.2.3