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

1 files changed, 11 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 4ab3bb1bb..3a1f3fb11 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
@@ -84,6 +84,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
         private bool _rml_has_no_cct;
         private TaskItem _preparingTaskItem;
         private IColorConverter _converter;
+        private string _current_job_string;
 
         #region Properties
 
@@ -1883,6 +1884,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                     SelectedSegment = _selectedSegment;
 
+                    if (ActiveJob != null)
+                    {
+                        _current_job_string = ActiveJob.ToJobFileWhenLoaded().ToString();
+                    }
+
                     UIHelper.DoEvents();
                     _navigation.NavigateTo(DeveloperNavigationView.JobView);
                 }
@@ -1938,6 +1944,10 @@ namespace Tango.MachineStudio.Developer.ViewModels
                         settings.DefaultJobRmlGuid = ActiveJob.RmlGuid;
                         settings.Save();
 
+                        if (ActiveJob != null)
+                        {
+                            _current_job_string = ActiveJob.ToJobFileWhenLoaded().ToString();
+                        }
                     });
                 }
 
@@ -1950,7 +1960,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             LogManager.Log("User request for 'back to jobs'...");
             LogManager.Log("Comparing active job with selected job...");
 
-            bool jobModified = !ActiveJob.CompareUsingJson(SelectedMachineJob);
+            bool jobModified = ActiveJob.ToJobFileWhenLoaded().ToString() != _current_job_string;
 
             if (jobModified)
             {