From 2ea2bb5bcd96045f1bd6cb4c3d8b8416dbaa05dc Mon Sep 17 00:00:00 2001 From: Roy Date: Tue, 26 Dec 2017 21:16:15 +0200 Subject: MERGE --- .../Web/Tango.MachineService/App_Data/Tango.db | Bin 557056 -> 557056 bytes .../Controllers/SynchronizationController.cs | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Visual_Studio/Web/Tango.MachineService') diff --git a/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db b/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db index 0419b065c..f7af9b52f 100644 Binary files a/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db and b/Software/Visual_Studio/Web/Tango.MachineService/App_Data/Tango.db differ diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/SynchronizationController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/SynchronizationController.cs index 8540863c0..8b5bee7ae 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/SynchronizationController.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/SynchronizationController.cs @@ -37,7 +37,7 @@ namespace Tango.MachineService.Controllers File.Copy(HostingEnvironment.MapPath(@"~/App_Data/Tango.db"), masterSQLiteFile); //Synchronize the SQL Server db with the new SQLite template. (Overwrite basically) - RemoteDBSynchronizer.Synchronize(masterSQLiteFile, request.SerialNumber); + RemoteDBSynchronizer.Synchronize(masterSQLiteFile, request.SerialNumber, true); //Synchronize the received machine db with the filled template. LocalDBSynchronizer.Synchronize(masterSQLiteFile, slaveSQLiteFile); -- cgit v1.3.1