4 files changed, 4 insertions, 4 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorParametersVewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorParametersVewVM.cs
index e13e016c5..8df4708d8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorParametersVewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorParametersVewVM.cs
@@ -419,7 +419,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
         {
             if (SelectedMachineGUID == null)
             {
-                _notification.ShowWarning(LogManager.Log($"Please, select machine.", LogCategory.Warning));
+              //  _notification.ShowWarning(LogManager.Log($"Please, select machine.", LogCategory.Warning));
                 IsFree = false;
                 return;
             }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorShadeViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorShadeViewVM.cs
index f305d5139..9841ee674 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorShadeViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/ColorShadeViewVM.cs
@@ -165,7 +165,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
         {
             if (SelectedMachineGUID == null)
             {
-                _notification.ShowWarning(LogManager.Log($"Please, select machine.", LogCategory.Warning));
+              //  _notification.ShowWarning(LogManager.Log($"Please, select machine.", LogCategory.Warning));
                 IsFree = false;
                 return;
             }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
index 853a415a3..164d37b74 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/MainViewVM.cs
@@ -1046,7 +1046,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
                         {
                             SelectedMachine = Machines.SingleOrDefault(x => x.SerialNumber == settings.LastVirtualMachineSerialNumber);
                         }
-                        else
+                        if(SelectedMachine == null)
                         {
                             SelectedMachine = Machines.First();
                         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
index f639eb6e7..8a75c526f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ThreadExtensions/ViewModels/TestResultsViewVM.cs
@@ -256,7 +256,7 @@ namespace Tango.MachineStudio.ThreadExtensions.ViewModels
         {
             if (String.IsNullOrEmpty(SelectedMachineGUID))
             {
-                _notification.ShowWarning(LogManager.Log($" Please, select machine.", LogCategory.Warning));
+             //   _notification.ShowWarning(LogManager.Log($" Please, select machine.", LogCategory.Warning));
                 return;
             }