aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-07-18 08:03:17 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-07-18 08:03:17 +0300
commit4b0ca04d68b04507cd0947444936509bda3cb8c8 (patch)
treeae9c5d19aa05bf20b1682dbc1ac3441fa2721c67 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
parente96d9f083aa58b24d2e64cbbec47e638d0ce84a0 (diff)
parent97150bf5a7f5844d9da47523e3136ce87c305ba0 (diff)
downloadTango-4b0ca04d68b04507cd0947444936509bda3cb8c8.tar.gz
Tango-4b0ca04d68b04507cd0947444936509bda3cb8c8.zip
merge
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs6
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 ab74fcca8..83ebde0e5 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
@@ -700,11 +700,15 @@ namespace Tango.MachineStudio.Developer.ViewModels
_colorConversionThread.Start();
}
+ #endregion
+
+ #region Color Conversion
+
private void ColorConversionThreadMethod()
{
while (true)
{
- if (IsVisible && ActiveJob != null)
+ if (IsVisible && ActiveJob != null && ActiveJob.Segments != null)
{
var stops = ActiveJob.Segments.SelectMany(x => x.BrushStops);