Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 10 insertions, 6 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/MachineStudioUpdateService.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/MachineStudioUpdateService.cs
index 77828d490..5b90cb095 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/MachineStudioUpdateService.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Update/MachineStudioUpdateService.cs
@@ -10,33 +10,37 @@ namespace Tango.MachineStudio.Common.Update
 {
     public class MachineStudioUpdateService : IMachineStudioUpdateService
     {
-        private string address;
         private WebTransportClient _client;
 
         public MachineStudioUpdateService()
         {
-            address = SettingsManager.Default.GetOrCreate<MachineStudioSettings>().GetMachineServiceAddress() + "/api/MachineStudio/";
+          
             _client = new WebTransportClient();
         }
 
         public Task<CheckForUpdatesResponse> CheckForUpdates(CheckForUpdatesRequest request)
         {
-            return _client.PostJson<CheckForUpdatesRequest, CheckForUpdatesResponse>(address + "CheckForUpdates", request);
+            return _client.PostJson<CheckForUpdatesRequest, CheckForUpdatesResponse>(GetAddress() + "CheckForUpdates", request);
         }
 
         public Task<UploadVersionResponse> UploadVersion(UploadVersionRequest request)
         {
-            return _client.PostJson<UploadVersionRequest, UploadVersionResponse>(address + "UploadVersion", request);
+            return _client.PostJson<UploadVersionRequest, UploadVersionResponse>(GetAddress() + "UploadVersion", request);
         }
 
         public Task<UploadCompletedResponse> NotifyUploadCompleted(UploadCompletedRequest request)
         {
-            return _client.PostJson<UploadCompletedRequest, UploadCompletedResponse>(address + "NotifyUploadCompleted", request);
+            return _client.PostJson<UploadCompletedRequest, UploadCompletedResponse>(GetAddress() + "NotifyUploadCompleted", request);
         }
 
         public Task<LatestVersionResponse> GetLatestVersion(LatestVersionRequest request)
         {
-            return _client.PostJson<LatestVersionRequest, LatestVersionResponse>(address + "GetLatestVersion", request);
+            return _client.PostJson<LatestVersionRequest, LatestVersionResponse>(GetAddress() + "GetLatestVersion", request);
+        }
+
+        private String GetAddress()
+        {
+            return SettingsManager.Default.GetOrCreate<MachineStudioSettings>().GetMachineServiceAddress() + "/api/MachineStudio/";
         }
     }
 }