From 00a491d93733d4625ad329b2ba8237f445364b3f Mon Sep 17 00:00:00 2001
From: Mirta <mirta@twine-s.com>
Date: Wed, 30 Dec 2020 16:39:52 +0200
Subject: merge

---
 .../Operation/DefaultMachineEventsStateProvider.cs           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'Software/Visual_Studio/Tango.Integration/Operation/DefaultMachineEventsStateProvider.cs')

diff --git a/Software/Visual_Studio/Tango.Integration/Operation/DefaultMachineEventsStateProvider.cs b/Software/Visual_Studio/Tango.Integration/Operation/DefaultMachineEventsStateProvider.cs
index 79b6e59cb..8c376ea3e 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/DefaultMachineEventsStateProvider.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/DefaultMachineEventsStateProvider.cs
@@ -16,11 +16,11 @@ namespace Tango.Integration.Operation
     /// <seealso cref="Tango.Integration.Operation.IMachineEventsStateProvider" />
     public class DefaultMachineEventsStateProvider : ExtendedObject, IMachineEventsStateProvider
     {
-        private ReadOnlyObservableCollection<MachinesEvent> _events;
+        private ReadOnlyCollection<MachinesEvent> _events;
         /// <summary>
         /// Gets the current machine events.
         /// </summary>
-        public ReadOnlyObservableCollection<MachinesEvent> Events
+        public ReadOnlyCollection<MachinesEvent> Events
         {
             get
             {
@@ -64,7 +64,7 @@ namespace Tango.Integration.Operation
         /// </summary>
         public DefaultMachineEventsStateProvider()
         {
-            _events = new ReadOnlyObservableCollection<MachinesEvent>(new ObservableCollection<MachinesEvent>());
+            _events = new ReadOnlyCollection<MachinesEvent>(new Collection<MachinesEvent>());
         }
 
         /// <summary>
@@ -79,7 +79,7 @@ namespace Tango.Integration.Operation
             List<MachinesEvent> newEvents = receivedEvents.Where(x => !_events.ToList().Exists(y => y.Type == x.Type)).ToList();
             List<MachinesEvent> oldEvents = _events.Where(x => !receivedEvents.Exists(y => y.Type == x.Type)).ToList();
 
-            _events = new ReadOnlyObservableCollection<MachinesEvent>(new ObservableCollection<MachinesEvent>(receivedEvents));
+            _events = new ReadOnlyCollection<MachinesEvent>(receivedEvents);
 
             if (newEvents.Count > 0)
             {
@@ -93,7 +93,7 @@ namespace Tango.Integration.Operation
             if (newEvents.Count > 0 || oldEvents.Count > 0)
             {
                 RaisePropertyChanged(nameof(Events));
-                OnEventsChanged(_events);
+                OnEventsChanged(newEvents.Concat(oldEvents));
             }
 
             OnEventsReceived(_events);
@@ -142,7 +142,7 @@ namespace Tango.Integration.Operation
         /// </summary>
         public void Reset()
         {
-            _events = new ReadOnlyObservableCollection<MachinesEvent>(new ObservableCollection<MachinesEvent>(new List<MachinesEvent>()));
+            _events = new ReadOnlyCollection<MachinesEvent>(new List<MachinesEvent>());
             RaisePropertyChanged(nameof(Events));
             OnEventsChanged(new List<MachinesEvent>());
         }
-- 
cgit v1.3.1