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

1 files changed, 22 insertions, 16 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 f1a205f5d..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)
+                        foreach (var type in _db.EventTypes)
+                        {
+                            _eventTypesGuids.Add((EventTypes)type.Code, type);
+                        }
+
+                        _isInitialized = true;
+                    }
+                    catch
                     {
-                        _eventTypesGuids.Add((EventTypes)type.Code, type);
+                        _isInitialized = false;
                     }
-
-                    _isInitialized = true;
-                }
-                catch
-                {
-                    _isInitialized = false;
                 }
             }
         }
@@ -194,10 +198,10 @@ namespace Tango.MachineStudio.Common.EventLogging
         /// <param name="events">The events.</param>
         private void MachineEventsStateProvider_EventsResolved(object sender, IEnumerable<MachinesEvent> events)
         {
-            foreach (var ev in events)
-            {
-                Log(String.Format("Event '{0}' resolved.", ev.EventType.Name));
-            }
+            //foreach (var ev in events)
+            //{
+            //    Log(String.Format("Event '{0}' resolved.", ev.EventType.Name));
+            //}
         }
 
         #endregion
@@ -210,6 +214,8 @@ namespace Tango.MachineStudio.Common.EventLogging
         /// <param name="machineEvent">The machine event.</param>
         public void Log(MachinesEvent machineEvent)
         {
+            Init();
+
             machineEvent.HostName = _hostName;
             machineEvent.EventType = _eventTypesGuids[machineEvent.Type];