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

Fixing crash with terminal buffer getting changed while enumerating

Browse source
This commit is contained in:
LarsBrubaker 2020-10-06 07:50:47 -07:00
parent e832522155
commit e64488bd5a
4 changed files with 44 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

21
MatterControlLib/PrinterControls/TerminalWindow/TextScrollWidget.cs
View file

@ -41,7 +41,7 @@ namespace MatterHackers.MatterControl
{
private object locker = new object();
private List<TerminalLine> allSourceLines;
private TerminalLog terminalLog;
private List<string> visibleLines;
private TypeFacePrinter typeFacePrinter = null;
@ -51,13 +51,13 @@ namespace MatterHackers.MatterControl
private Func<TerminalLine, string> _lineFilterFunction;
public TextScrollWidget(PrinterConfig printer, List<TerminalLine> sourceLines)
public TextScrollWidget(PrinterConfig printer, TerminalLog terminalLog)
{
this.printer = printer;
this.typeFacePrinter = new TypeFacePrinter("", new StyledTypeFace(ApplicationController.GetTypeFace(NamedTypeFace.Liberation_Mono), 12));
this.typeFacePrinter.DrawFromHintedCache = true;
this.allSourceLines = sourceLines;
this.visibleLines = sourceLines.Select(ld => ld.Line).ToList();
this.terminalLog = terminalLog;
this.visibleLines = terminalLog.AllLines().ToList();
// Register listeners
printer.Connection.TerminalLog.LineAdded += this.TerminalLog_LineAdded;
@ -140,22 +140,15 @@ namespace MatterHackers.MatterControl
public void RebuildFilteredList()
{
lock (locker)
foreach (var lineData in terminalLog.AllTerminalLines())
{
visibleLines = new List<string>();
var allSourceLinesTemp = allSourceLines.ToArray();
foreach (var lineData in allSourceLinesTemp)
{
ConditionalyAddToVisible(lineData);
}
ConditionalyAddToVisible(lineData);
}
}
public void WriteToFile(string filePath)
{
// Make a copy so we don't have it change while writing.
string[] allSourceLinesTemp = allSourceLines.Select(ld => ld.Line).ToArray();
System.IO.File.WriteAllLines(filePath, allSourceLinesTemp);
System.IO.File.WriteAllLines(filePath, terminalLog.AllLines());
}
public override void OnClosed(EventArgs e)