1 files changed, 10 insertions, 13 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
index c19208724..8661168b0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -29,7 +29,6 @@ namespace Tango.PPC.Common.MachineUpdate
     {
         private IPPCApplicationManager _app_manager;
         private IMachineProvider _machineProvider;
-        private String _accessToken;
 
         #region Events
 
@@ -72,19 +71,17 @@ namespace Tango.PPC.Common.MachineUpdate
 
         #region Private Methods
 
-        private Task Login(String serialNumber)
+        private Task<String> Login(String serialNumber)
         {
-            return Task.Factory.StartNew(() =>
+            return Task.Factory.StartNew<String>(() =>
             {
                 using (var client = new PPCWebService())
                 {
-                    var response = client.Login(new LoginRequest()
+                    return client.Login(new LoginRequest()
                     {
                         Mode = LoginMode.Machine,
                         SerialNumber = serialNumber,
-                    }).Result;
-
-                    _accessToken = response.AccessToken;
+                    }).Result.AccessToken;
                 }
             });
         }
@@ -131,10 +128,10 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
-                await Login(serialNumber);
+                String accessToken = await Login(serialNumber);
 
                 DownloadUpdateRequest request = new DownloadUpdateRequest();
-                request.AccessToken = _accessToken;
+                request.AccessToken = accessToken;
 
                 DownloadUpdateResponse update_response = null;
 
@@ -301,12 +298,12 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
-                Login(serialNumber).Wait();
+                String accessToken = Login(serialNumber).Result;
 
                 LogManager.Log($"Checking if updates available...");
 
                 CheckForUpdateRequest request = new CheckForUpdateRequest();
-                request.AccessToken = _accessToken;
+                request.AccessToken = accessToken;
                 request.Version = _app_manager.Version.ToString();
 
                 CheckForUpdateResponse update_response = null;
@@ -417,10 +414,10 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
-                Login(serialNumber).Wait();
+                String accessToken = Login(serialNumber).Result;
 
                 UpdateDBRequest request = new UpdateDBRequest();
-                request.AccessToken = _accessToken;
+                request.AccessToken = accessToken;
 
                 UpdateDBResponse update_response = null;