aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2020-06-04 10:08:04 +0300
committerAvi Levkovich <avi@twine-s.com>2020-06-04 10:08:04 +0300
commitcb7822348d04eae295656a3471b82a272e4873c8 (patch)
tree624dd00b56eefcf5899065f48a2ee6d912681b46 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer
parenta66202ccbf9b79219fe5d38e4e1e12311f8c07d1 (diff)
parent8f02bc33eab3c82aac624c390c0805bf29816108 (diff)
downloadTango-cb7822348d04eae295656a3471b82a272e4873c8.tar.gz
Tango-cb7822348d04eae295656a3471b82a272e4873c8.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs4
1 files changed, 2 insertions, 2 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 5477f97d6..eed594718 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
@@ -1376,7 +1376,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
/// <summary>
/// Starts the job.
/// </summary>
- private async void StartJob(Func<Job, JobHandler> resumeFunc = null)
+ private async void StartJob(Func<JobHandler> resumeFunc = null)
{
SettingsManager.Default.Save();
@@ -1441,7 +1441,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
}
else
{
- JobHandler = resumeFunc(ActiveJob);
+ JobHandler = resumeFunc();
}
_navigation.NavigateTo(DeveloperNavigationView.RunningJobView);