1 files changed, 12 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs
index cfa21a416..7d21bb487 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/ViewModels/DirectSynchronizationViewVM.cs
@@ -146,6 +146,8 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
 
         #endregion
 
+        #region Private Methods
+
         private void Compare()
         {
             if (SelectedMachine.SerialNumber != ApplicationManager.ConnectedMachine.SerialNumber)
@@ -166,8 +168,9 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
                         InvalidateRelayCommands();
                         Thread.Sleep(1500);
 
-                        ApplicationManager.ConnectedMachine.RequestTimeout = TimeSpan.FromSeconds(10);
-                        var response = await ApplicationManager.ConnectedMachine.SendRequest<DirectSynchronizationRequest, DirectSynchronizationResponse>(new DirectSynchronizationRequest());
+                        ApplicationManager.ConnectedMachine.UseKeepAlive = false;
+
+                        var response = await ApplicationManager.ConnectedMachine.SendRequest<DirectSynchronizationRequest, DirectSynchronizationResponse>(new DirectSynchronizationRequest(), TimeSpan.FromSeconds(30));
 
                         using (_notification.PushTaskItem("Generating temporary files..."))
                         {
@@ -227,6 +230,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
                         IsWorking = false;
                         SelectedDifference = null;
                         InvalidateRelayCommands();
+                        ApplicationManager.ConnectedMachine.UseKeepAlive = true;
                     }
                 }
             });
@@ -254,6 +258,8 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
                 {
                     try
                     {
+                        ApplicationManager.ConnectedMachine.UseKeepAlive = false;
+
                         IsWorking = true;
                         InvalidateRelayCommands();
                         Thread.Sleep(1500);
@@ -274,7 +280,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
                         var response = await ApplicationManager.ConnectedMachine.SendRequest<OverrideDataBaseRequest, OverrideDataBaseResponse>(new OverrideDataBaseRequest()
                         {
                             RemoteDB = ByteString.CopyFrom(remoteDbBytes)
-                        });
+                        }, TimeSpan.FromSeconds(30));
 
                         if (!response.Message.Successful)
                         {
@@ -301,6 +307,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
                         IsWorking = false;
                         SelectedDifference = null;
                         InvalidateRelayCommands();
+                        ApplicationManager.ConnectedMachine.UseKeepAlive = true;
                     }
                 }
             });
@@ -315,5 +322,7 @@ namespace Tango.MachineStudio.Synchronization.ViewModels
         {
             InvokeUINow(() => _notification.ShowInfo(message));
         }
+
+        #endregion
     }
 }