nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Let matterslice know we are canceling

Browse source
This commit is contained in:
Lars Brubaker 2015-01-13 10:34:27 -08:00
parent 4b71321019
commit ed7859cfac
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
SlicerConfiguration/SlicingQueue.cs
View file

@ -437,16 +437,20 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
internal void CancelCurrentSlicing()
{
if (slicerProcess != null)
{
using (TimedLock.Lock(slicerProcess, "SlicingProcess"))
{
if (slicerProcess != null && !slicerProcess.HasExited)
{
slicerProcess.Kill();
}
}
}
if (slicerProcess != null)
{
using (TimedLock.Lock(slicerProcess, "SlicingProcess"))
{
if (slicerProcess != null && !slicerProcess.HasExited)
{
slicerProcess.Kill();
}
}
}
else
{
MatterHackers.MatterSlice.MatterSlice.Stop();
}
}
}
}