empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Fixed crash when attempting to copy via Ctrl-C when trace log is empty

Browse source
This commit is contained in:
Souryo 2017-09-12 19:39:03 -04:00
parent c2d63f6166
commit 5fb7bd4f77
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
GUI.NET/Debugger/frmTraceLogger.cs
View file

@ -134,15 +134,17 @@ namespace Mesen.GUI.Debugger
{ {
switch(keyData) { switch(keyData) {
case Keys.C | Keys.Control: case Keys.C | Keys.Control:
if(_previousTrace != null) { if(_previousTrace != null && !this.txtCondition.Focused && txtTraceLog.SelectionStart >= 0) {
string[] lines = _previousTrace.Split('\n'); string[] lines = _previousTrace.Split('\n');
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for(int i = txtTraceLog.SelectionStart, end = txtTraceLog.SelectionStart + txtTraceLog.SelectionLength; i <= end; i++) { for(int i = txtTraceLog.SelectionStart, end = txtTraceLog.SelectionStart + txtTraceLog.SelectionLength; i <= end && i < lines.Length; i++) {
sb.AppendLine(lines[i]); sb.AppendLine(lines[i]);
} }
Clipboard.SetText(sb.ToString()); Clipboard.SetText(sb.ToString());
return true;
} }
return true; break;
} }
return base.ProcessCmdKey(ref msg, keyData); return base.ProcessCmdKey(ref msg, keyData);
} }
@ -197,9 +199,9 @@ namespace Mesen.GUI.Debugger
txtTraceLog.ShowSingleContentLineNotes = chkShowByteCode.Checked; txtTraceLog.ShowSingleContentLineNotes = chkShowByteCode.Checked;
txtTraceLog.LineIndentations = indent.ToArray(); txtTraceLog.LineIndentations = indent.ToArray();
txtTraceLog.TextLines = lineContent.ToArray();
txtTraceLog.LineNumbers = programCounter.ToArray(); txtTraceLog.LineNumbers = programCounter.ToArray();
txtTraceLog.TextLineNotes = byteCode.ToArray(); txtTraceLog.TextLineNotes = byteCode.ToArray();
txtTraceLog.TextLines = lineContent.ToArray();
if(scrollToBottom) { if(scrollToBottom) {
txtTraceLog.ScrollToLineIndex(txtTraceLog.LineCount - 1); txtTraceLog.ScrollToLineIndex(txtTraceLog.LineCount - 1);