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

1 files changed, 8 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
index 23be8d274..4fcebe3dd 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -49,7 +49,6 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             Scanner = scanner;
             ConnectCommand = new RelayCommand(Connect,(x) => SelectedMachine != null);
-            Scanner.Start();
         }
 
         /// <summary>
@@ -59,10 +58,17 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             if (SelectedMachine != null)
             {
+                Scanner.Stop();
                 Accept();
             }
         }
 
+        protected override void Cancel()
+        {
+            Scanner.Stop();
+            base.Cancel();
+        }
+
         /// <summary>
         /// Called when the dialog has been shown.
         /// </summary>
@@ -70,6 +76,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             base.OnShow();
             Scanner.AvailableMachines.Clear();
+            Scanner.Start();
         }
     }
 }