From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Wed, 4 Jan 2017 00:09:54 +0000 (+0100)
Subject: lock layouting when image loading
X-Git-Tag: v0.5.1~54
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=1ba15ebcac390fae4ee4e7cda91f8c473913a5af;p=jp%2Fcrow.git

lock layouting when image loading
---

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