Working on External bridge !

1 files changed, 14 insertions, 2 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
index 3c348c796..a5a8d9ac3 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
@@ -16,6 +16,8 @@ namespace Tango.PPC.UI.ViewModels
     [TangoCreateWhenRegistered]
     public class ExternalBridgeViewVM : PPCViewModel
     {
+        private bool _disconnecting;
+
         private ExternalBridgeClientConnectedEventArgs _connection;
         public ExternalBridgeClientConnectedEventArgs Connection
         {
@@ -34,17 +36,27 @@ namespace Tango.PPC.UI.ViewModels
 
         public ExternalBridgeViewVM()
         {
-            CloseSessionCommand = new RelayCommand(CloseSession);
+            CloseSessionCommand = new RelayCommand(CloseSession,() => !_disconnecting);
         }
 
         private void CloseSession()
         {
+            _disconnecting = true;
+            InvalidateRelayCommands();
             ExternalBridgeService.DisconnectSession();
         }
 
+        public override void OnNavigatedTo()
+        {
+            base.OnNavigatedTo();
+
+            _disconnecting = false;
+            InvalidateRelayCommands();
+        }
+
         public override void OnApplicationStarted()
         {
-            ExternalBridgeService.ClientConnected += ExternalBridgeService_ClientConnected;
+            ExternalBridgeService.ConnectionRequest += ExternalBridgeService_ClientConnected;
             ExternalBridgeService.ClientDisconnected += ExternalBridgeService_ClientDisconnected;
         }