Merged Eureka Branch !!!

1 files changed, 2 insertions, 2 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 0550383fb..293cccec4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -478,13 +478,12 @@ namespace Tango.MachineStudio.UI.ViewModels
                         x.SelectedMachine.JobUnitsMethod = _settings.JobUnitsMethod;
                         x.SelectedMachine.JobRunsLogger.JobSource = BL.Enumerations.JobSource.Remote;
 
-                        if (x.SelectedMachine is ExternalBridgeTcpClient)
+                        if (x.SelectedMachine is ExternalBridgeTcpClient && x.SelectedMachine.GetType() != typeof(ExternalBridgeTcpFirmwareClient))
                         {
                             x.SelectedMachine.As<ExternalBridgeTcpClient>().EnableApplicationLogs = x.EnableApplicationLogs;
                             x.SelectedMachine.RequestTimeout = _settings.ExternalBridgeRequestTimeout;
                             x.SelectedMachine.ContinuousRequestTimeout = _settings.ExternalBridgeContinuousRequestTimeout;
                         }
-
                         if (x.SelectedMachine.Adapter is TcpTransportAdapter)
                         {
                             (x.SelectedMachine.Adapter as TcpTransportAdapter).WriteMode = _settings.TcpTransportAdapterWriteMode;
@@ -581,6 +580,7 @@ namespace Tango.MachineStudio.UI.ViewModels
                 {
                     _reconnectionMachine = client;
 
+                    client.MachineType = machine.Type; //In case trying to connect to Eureka on USB.
                     await client.Connect();
                     client.SerialNumber = machine.SerialNumber;
                     ApplicationManager.SetConnectedMachine(client);