xrECore/ELog: async invoke in ELogCallback

OpenXRay · Mar 24, 2018 · 35ae230 · 35ae230
1 parent e52b701
commit 35ae230
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/editors/xrECore/Core/ELog.cpp b/src/editors/xrECore/Core/ELog.cpp
@@ -56,15 +56,22 @@ XRECORE_API void ELogCallback(void* context, pcstr message)
 
     if (windowLog)
     {
+
         if (isDialog)
         {
             auto d = gcnew WindowLog::AddMessageDelegate(windowLog, &WindowLog::AddDialogMessage);
-            windowLog->Invoke(d, gcnew array<Object^> { (int)type, gcnew String(message) });
+            if (windowLog->InvokeRequired)
+                windowLog->BeginInvoke(d, gcnew array<Object^> { (int)type, gcnew String(message) });
+            else
+                d(type, gcnew String(message));;
         }
         else
         {
             auto d = gcnew WindowLog::AddMessageDelegate(windowLog, &WindowLog::AddMessage);
-            windowLog->Invoke(d, gcnew array<Object^> { (int)type, gcnew String(message) });
+            if (windowLog->InvokeRequired)
+                windowLog->BeginInvoke(d, gcnew array<Object^> { (int)type, gcnew String(message) });
+            else
+                d(type, gcnew String(message));
         }
     }
 }