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

Took out timed lock

Browse source
This commit is contained in:
Lars Brubaker 2016-01-07 16:45:16 -08:00
parent f8cef1222c
commit 3196f61752
7 changed files with 28 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SlicerConfiguration/SlicingQueue.cs
View file

@ -124,7 +124,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
string preparingToSliceModelTxt = LocalizedString.Get("Preparing to slice model");
string peparingToSliceModelFull = string.Format("{0}...", preparingToSliceModelTxt);
itemToQueue.OnSlicingOutputMessage(new StringEventArgs(peparingToSliceModelFull));
using (TimedLock.Lock(listOfSlicingItems, "QueuePartForSlicing"))
lock(listOfSlicingItems)
{
//Add to thumbnail generation queue
listOfSlicingItems.Add(itemToQueue);
@ -438,7 +438,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
string stdError = slicerProcess.StandardError.ReadToEnd();
slicerProcess.WaitForExit();
using (TimedLock.Lock(slicerProcess, "SlicingProcess"))
lock(slicerProcess)
{
slicerProcess = null;
}
@ -497,7 +497,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
itemToSlice.DoneSlicing = true;
});
using (TimedLock.Lock(listOfSlicingItems, "CreateSlicedPartsThread()"))
lock(listOfSlicingItems)
{
listOfSlicingItems.RemoveAt(0);
}
@ -534,7 +534,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
if (slicerProcess != null)
{
using (TimedLock.Lock(slicerProcess, "SlicingProcess"))
lock(slicerProcess)
{
if (slicerProcess != null && !slicerProcess.HasExited)
{