test loadingThread != null before checking cancel state

diff --git a/Crow/src/Widgets/TemplatedGroup.cs b/Crow/src/Widgets/TemplatedGroup.cs
index 7c84f5459c763b9669a18e09b72a89e065993965..cfa6cd1c8e1bbf37678e035bef8fdcbbbdd6d939 100644 (file)
--- 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();