lock RenderMutex when loading, test lqi==null, list loading slowed down

1 files changed, 7 insertions, 4 deletions

diff --git a/src/Interface.cs b/src/Interface.cs
index 36ac681d..82688594 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -205,9 +205,11 @@ namespace Crow
 
 		public GraphicObject LoadInterface (string path)
 		{
-			GraphicObject tmp = Interface.Load (path, this);
-			AddWidget (tmp);
-			return tmp;
+			lock (RenderMutex) {
+				GraphicObject tmp = Interface.Load (path, this);
+				AddWidget (tmp);
+				return tmp;
+			}
 		}
 
 		#endregion
@@ -310,7 +312,8 @@ namespace Crow
 				while (queueCount > 0) {
 					lock (Interface.LayoutingQueue)
 						lqi = Interface.LayoutingQueue.Dequeue ();
-					lqi.ProcessLayouting ();
+					if (lqi!=null)
+						lqi.ProcessLayouting ();
 					lock (Interface.LayoutingQueue)
 						queueCount = Interface.LayoutingQueue.Count;
 				}