1 files changed, 23 insertions, 12 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 57f1d704c..84c4e2dd3 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -26,6 +26,7 @@ using Tango.MachineStudio.UI.SupervisingController;
 using Tango.MachineStudio.UI.Views;
 using Tango.MachineStudio.UI.Windows;
 using Tango.PMR.Stubs;
+using Tango.Settings;
 using Tango.SharedUI;
 using Tango.SharedUI.Helpers;
 using Tango.Transport.Adapters;
@@ -333,21 +334,31 @@ namespace Tango.MachineStudio.UI.ViewModels
                     }
                     else
                     {
-                        using (NotificationProvider.PushTaskItem("Connecting to " + x.SelectedMachine.ToString() + "..."))
+                        _notificationProvider.ShowModalDialog<MachineSerialViewVM>(async (vm) =>
                         {
-                            try
+                            if (vm.SelectedMachine != null)
                             {
-                                await x.SelectedMachine.Connect();
-                                ApplicationManager.ConnectedMachine = x.SelectedMachine;
-                            }
-                            catch (Exception ex)
-                            {
-                                logManager.Log(ex);
-                                _notificationProvider.ShowError(ex.Message);
-                            }
+                                using (NotificationProvider.PushTaskItem("Connecting to " + x.SelectedMachine.ToString() + "..."))
+                                {
+                                    try
+                                    {
+                                        await x.SelectedMachine.Connect();
+                                        x.SelectedMachine.SerialNumber = vm.SelectedMachine.SerialNumber;
+                                        ApplicationManager.ConnectedMachine = x.SelectedMachine;
 
-                            InvalidateRelayCommands();
-                        }
+                                        SettingsManager.Default.MachineStudio.LastVirtualMachineSerialNumber = vm.SelectedMachine.SerialNumber;
+                                        SettingsManager.SaveDefaultSettings();
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        logManager.Log(ex);
+                                        _notificationProvider.ShowError(ex.Message);
+                                    }
+
+                                    InvalidateRelayCommands();
+                                }
+                            }
+                        });
                     }
 
                     InvalidateRelayCommands();