test loadingThread != null before checking cancel state

1 files changed, 8 insertions, 4 deletions

diff --git a/Crow/src/Widgets/TemplatedGroup.cs b/Crow/src/Widgets/TemplatedGroup.cs
index 7c84f545..cfa6cd1c 100644
--- a/Crow/src/Widgets/TemplatedGroup.cs
+++ b/Crow/src/Widgets/TemplatedGroup.cs
@@ -440,10 +440,14 @@ namespace Crow {
 				if (iTemp == null)
 					iTemp = ItemTemplates ["default"];
 			}
-			while (!Monitor.TryEnter(IFace.LayoutMutex)) {
-				if (loadingThread.cancelRequested)
-					return;
-				Thread.Sleep(1);
+			if (loadingThread == null)
+				Monitor.Enter(IFace.LayoutMutex);
+			else {
+				while (!Monitor.TryEnter(IFace.LayoutMutex)) {
+					if (loadingThread.cancelRequested)
+						return;
+					Thread.Sleep(1);
+				}
 			}
 			
 				g = iTemp.CreateInstance();