merge

1 files changed, 11 insertions, 4 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
index 98fcf12db..50caced63 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/ViewModels/EventsViewVM.cs
@@ -25,6 +25,7 @@ namespace Tango.MachineStudio.Logging.ViewModels
         private ObservableCollection<MachinesEvent> _realTimeEvents;
         private Machine _connectedMachine;
         private LoggingNavigationManager _navigation;
+        private bool _dialog_shown;
 
         private Machine _selectedMachine;
         public Machine SelectedMachine
@@ -178,10 +179,16 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
         private void OnSelectedEventChanged()
         {
-            if (SelectedEvent != null && SelectedEvent.Type != BL.Enumerations.EventTypes.ApplicationStarted)
+            if (SelectedEvent != null && SelectedEvent.Type != BL.Enumerations.EventTypes.ApplicationStarted && !_dialog_shown)
             {
-                _notification.ShowModalDialog<EventDetailsViewVM, EventDetailsView>(new EventDetailsViewVM(SelectedEvent), (x) => { }, () => { });
-                SelectedEvent = null;
+                _dialog_shown = true;
+                _notification.ShowModalDialog<EventDetailsViewVM, EventDetailsView>(new EventDetailsViewVM(SelectedEvent), (x) =>
+                {
+
+                }, () =>
+                {
+                    _dialog_shown = false;
+                });
             }
         }
 
@@ -192,7 +199,7 @@ namespace Tango.MachineStudio.Logging.ViewModels
 
             TimelineViewVM.Initialize(events.ToList());
 
-            _navigation.NavigateTo(LoggingNavigationView.TimelineView);
+            _navigation.NavigateTo(LoggingNavigationView.TimelineWrapperView);
         }
     }
 }