aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-12-17 11:13:44 +0200
committerShlomo Hecht <shlomo@twine-s.com>2018-12-17 11:13:44 +0200
commit3b2d3e0e07b6115b143fb8d4a48cb94bb1e17f95 (patch)
tree3d968d7a66bea111e36c716f6c153bf5620ffdef /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels
parent2c37dcf7dc299a8ff66a5c46b4b2424d37005e11 (diff)
parent9562ca15079cdbf2bcfd11c8c8def4a8e4573a78 (diff)
downloadTango-3b2d3e0e07b6115b143fb8d4a48cb94bb1e17f95.tar.gz
Tango-3b2d3e0e07b6115b143fb8d4a48cb94bb1e17f95.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs7
1 files changed, 7 insertions, 0 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 70378a4d5..c9cd3276f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -453,6 +453,13 @@ namespace Tango.MachineStudio.UI.ViewModels
if (x.SelectedMachine.RequiresAuthentication)
{
+ //Check machine exist on my database first
+ if (x.SelectedMachine.Machine == null)
+ {
+ _notificationProvider.ShowError( $"The specified machine '{x.SelectedMachine.SerialNumber}' could not be found on the database. Aborting connection.");
+ return;
+ }
+
_notificationProvider.ShowModalDialog<MachineLoginViewVM>(async (login) =>
{
using (NotificationProvider.PushTaskItem("Connecting to machine " + x.SelectedMachine.ToString() + "..."))