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

1 files changed, 9 insertions, 2 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
index e84fd81a1..3b45a0c2b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
@@ -35,6 +35,7 @@ namespace Tango.PPC.UI.ViewModels
         private bool _isPowerUpDialogShown;
         private bool _isThreadLoadingShown;
         private PowerUpAppBarItem _powerUpAppBar;
+        private bool _started;
 
         private DateTime _currentDateTime;
         /// <summary>
@@ -79,6 +80,7 @@ namespace Tango.PPC.UI.ViewModels
 
         private void MachineOperator_PowerUpEnded(object sender, EventArgs e)
         {
+            _started = false;
             _powerUpAppBar?.Close();
             _powerUpAppBar = null;
         }
@@ -93,6 +95,8 @@ namespace Tango.PPC.UI.ViewModels
 
         private void MachineOperator_PowerUpStarted(object sender, PMR.Power.StartPowerUpResponse e)
         {
+            _started = true;
+
             InvokeUI(() =>
             {
                 if (_powerUpAppBar != null)
@@ -100,8 +104,11 @@ namespace Tango.PPC.UI.ViewModels
                     _powerUpAppBar.Close();
                 }
 
-                _powerUpAppBar = NotificationProvider.PushAppBarItem<PowerUpAppBarItem>();
-                _powerUpAppBar.Priority = AppBarPriority.Low;
+                if (_started)
+                {
+                    _powerUpAppBar = NotificationProvider.PushAppBarItem<PowerUpAppBarItem>();
+                    _powerUpAppBar.Priority = AppBarPriority.Low;
+                }
             });
         }