Fixed issue with Start/Stop App Button on PPC.

Implemented new notifications design.

1 files changed, 6 insertions, 4 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
index 9cd34e67c..d7dca484e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Notifications/DefaultNotificationProvider.cs
@@ -29,6 +29,7 @@ namespace Tango.PPC.UI.Notifications
     {
         private ConcurrentQueue<PendingNotification<MessageBoxVM, bool>> _pendingMessageBoxes;
         private ConcurrentQueue<PendingNotification<DialogAndView, DialogViewVM>> _pendingDialogs;
+        private List<AppButton> _appButtons;
 
         private bool _notificationsVisible;
         /// <summary>
@@ -60,6 +61,7 @@ namespace Tango.PPC.UI.Notifications
             TaskBarItems = new ObservableCollection<TaskBarItem>();
             _pendingMessageBoxes = new ConcurrentQueue<PendingNotification<MessageBoxVM, bool>>();
             _pendingDialogs = new ConcurrentQueue<PendingNotification<DialogAndView, DialogViewVM>>();
+            _appButtons = new List<AppButton>();
 
             PopNotificationCommand = new RelayCommand<NotificationItem>((x) => PopNotification(x));
 
@@ -521,6 +523,7 @@ namespace Tango.PPC.UI.Notifications
         /// <param name="appButton">The app button.</param>
         public void PushAppButton(AppButton appButton)
         {
+            _appButtons.Insert(0, appButton);
             CurrentAppButton = appButton;
         }
 
@@ -530,10 +533,9 @@ namespace Tango.PPC.UI.Notifications
         /// <param name="appButton">The app button.</param>
         public void PopAppButton(AppButton appButton)
         {
-            if (CurrentAppButton == appButton)
-            {
-                CurrentAppButton = null;
-            }
+            _appButtons.RemoveAll(x => x == appButton);
+
+            CurrentAppButton = _appButtons.FirstOrDefault();
         }
     }
 }