merge conflicts

1 files changed, 5 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 63cfa10b8..71cbd9ffe 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -50,6 +50,7 @@ using Tango.Core.ExtensionMethods;
 using Tango.ColorConversion;
 using Tango.PMR.Exports;
 using Microsoft.WindowsAPICodePack.Dialogs;
+using Tango.BL.Enumerations;
 
 namespace Tango.MachineStudio.Developer.ViewModels
 {
@@ -1914,13 +1915,14 @@ namespace Tango.MachineStudio.Developer.ViewModels
                         {
                             LogManager.Log(String.Format("Saving the active job {0}...", ActiveJob.Name));
                             ActiveJob.LastUpdated = DateTime.UtcNow;
+                            ActiveJob.IsSynchronized = false;
                             ActiveJob.Rml = SelectedRML;
                             ActiveJob.EstimatedDurationMili = (int)EstimatedDuration.TotalMilliseconds;
+                            ActiveJob.MarkModified(_activeJobDbContext);
                             _activeJobDbContext.SaveChanges();
 
                             _machineDbContext.Entry(SelectedMachineJob).Reload();
 
-
                             _machineDbContext.Entry(SelectedMachineJob).Collection(x => x.Segments).Load();
 
                             foreach (var segment in SelectedMachineJob.Segments.ToList())
@@ -2210,6 +2212,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
                     var settings = SettingsManager.Default.GetOrCreate<DeveloperModuleSettings>();
 
                     Job newJob = new Job();
+                    newJob.LastUpdated = DateTime.UtcNow;
+                    newJob.JobSource = JobSource.Remote;
                     newJob.Name = jobName;
                     newJob.CreationDate = DateTime.UtcNow;
                     newJob.UserGuid = AuthenticationProvider.CurrentUser.Guid;