diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-01-13 09:19:24 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-01-13 09:19:24 +0200 |
| commit | fd0d8d7668aefea359dad4d7737bb4c71344a292 (patch) | |
| tree | 85068eed5cae59724820de8b63143005a3d9506c /Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels | |
| parent | 78d001b5ba7f6fac4fe44a266692addbdc19d6ac (diff) | |
| parent | 3bdeaff66bdfe57d67b27ca7fd8194604499131f (diff) | |
| download | Tango-fd0d8d7668aefea359dad4d7737bb4c71344a292.tar.gz Tango-fd0d8d7668aefea359dad4d7737bb4c71344a292.zip | |
merge conflicts
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels')
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs index 1de54b784..a2f67b2ba 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs @@ -178,6 +178,7 @@ namespace Tango.PPC.Jobs.ViewModels { if (_handler != null) { + _stop_job_btn.Pop(); _handler.Cancel(); } } |