Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 16 insertions, 12 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
index 4da1121b7..89b8920d9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/EventLogging/DefaultEventLogger.cs
@@ -29,6 +29,7 @@ namespace Tango.MachineStudio.Common.EventLogging
     public class DefaultEventLogger : ExtendedObject, IEventLogger
     {
         private ObservablesContext _db;
+        private static object _lockInit = new object();
         private Thread _logThread;
         private ConcurrentQueue<MachinesEvent> _events;
         private IStudioApplicationManager _application;
@@ -89,24 +90,27 @@ namespace Tango.MachineStudio.Common.EventLogging
 
         private void Init()
         {
-            if (!_isInitialized)
+            lock (_lockInit)
             {
-                try
+                if (!_isInitialized)
                 {
-                    _db = ObservablesContext.CreateDefault();
+                    try
+                    {
+                        _db = ObservablesContext.CreateDefault();
+
+                        _db.EventTypes.ToList();
 
-                    _db.EventTypes.ToList();
+                        foreach (var type in _db.EventTypes)
+                        {
+                            _eventTypesGuids.Add((EventTypes)type.Code, type);
+                        }
 
-                    foreach (var type in _db.EventTypes)
+                        _isInitialized = true;
+                    }
+                    catch
                     {
-                        _eventTypesGuids.Add((EventTypes)type.Code, type);
+                        _isInitialized = false;
                     }
-
-                    _isInitialized = true;
-                }
-                catch
-                {
-                    _isInitialized = false;
                 }
             }
         }