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

2
PrinterControls/TerminalWindow/PrinterOutputCache.cs
View file

@ -116,7 +116,7 @@ namespace MatterHackers.MatterControl
public void Clear()
{
using (TimedLock.Lock(PrinterLines, "Clearing Printer Lines"))
lock(PrinterLines)
{
PrinterLines.Clear();
}

8
PrinterControls/TerminalWindow/TextScrollWidget.cs
View file

@ -38,6 +38,8 @@ namespace MatterHackers.MatterControl
{
public class TextScrollWidget : GuiWidget
{
object locker = new object();
private string[] StartLineStringFilters = null;
private event EventHandler unregisterEvents;
@ -137,7 +139,7 @@ namespace MatterHackers.MatterControl
private void CreateFilteredList()
{
using (TimedLock.Lock(this, "CreatingFilteredList"))
lock(locker)
{
visibleLines = new List<string>();
string[] allSourceLinesTemp = allSourceLines.ToArray();
@ -185,9 +187,9 @@ namespace MatterHackers.MatterControl
int numLinesToDraw = NumVisibleLines;
double y = LocalBounds.Bottom + printer.TypeFaceStyle.EmSizeInPixels * numLinesToDraw;
using (TimedLock.Lock(visibleLines, ""))
lock(visibleLines)
{
using (TimedLock.Lock(this, "DrawingLines"))
lock(locker)
{
int startLineIndex = visibleLines.Count - numLinesToDraw;
if (forceStartLine != -1)