From 1ba15ebcac390fae4ee4e7cda91f8c473913a5af Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= <jp_bruyere@hotmail.com>
Date: Wed, 4 Jan 2017 01:09:54 +0100
Subject: [PATCH] lock layouting when image loading

---
 src/GraphicObjects/Image.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/GraphicObjects/Image.cs b/src/GraphicObjects/Image.cs
index 61b6e059..fa036b97 100644
--- a/src/GraphicObjects/Image.cs
+++ b/src/GraphicObjects/Image.cs
@@ -50,9 +50,11 @@ namespace Crow
 						_pic = null;
 						return;
 					}
-					LoadImage (value);
-					_pic.Scaled = scaled;
-					_pic.KeepProportions = keepProps;
+					lock(CurrentInterface.LayoutMutex){
+						LoadImage (value);
+						_pic.Scaled = scaled;
+						_pic.KeepProportions = keepProps;
+					}
 				} catch (Exception ex) {
 					Debug.WriteLine (ex.Message);
 					_pic = null;
@@ -86,7 +88,6 @@ namespace Crow
 
 			_pic.LoadImage (path);
 			RegisterForGraphicUpdate ();
-			RegisterForLayouting (LayoutingType.Sizing);
 		}
 		#endregion
 
-- 
2.47.3