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

Debugger: Fixed memory viewer crash

Browse source
This commit is contained in:
Souryo 2016-01-19 20:26:11 -05:00
parent b3a6447a94
commit 6d691e5cab
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
GUI.NET/Debugger/Controls/ctrlHexViewer.cs
View file

@ -14,7 +14,6 @@ namespace Mesen.GUI.Debugger.Controls
{
public event EventHandler ColumnCountChanged;
private string[] _previousHexContent = null;
private int _currentColumnCount;
private byte[] _data;
@ -39,18 +38,19 @@ namespace Mesen.GUI.Debugger.Controls
{
if(value != null) {
if(_currentColumnCount != this.ColumnCount) {
this._previousHexContent = null;
_currentColumnCount = this.ColumnCount;
}
this._data = value;
string[] hexContent;
int[] lineNumbers;
string[] hexContent, previousHexContent = null;
int[] lineNumbers, previousLineNumbers;
if(this._data != null && this._data.Length == value.Length) {
this.ArrayToHex(this._data, out previousHexContent, out previousLineNumbers);
}
this.ArrayToHex(value, out hexContent, out lineNumbers);
this.ctrlDataViewer.CompareLines = _previousHexContent;
this.ctrlDataViewer.CompareLines = previousHexContent;
this.ctrlDataViewer.TextLines = hexContent;
_previousHexContent = hexContent;
this._data = value;
this.ctrlDataViewer.LineNumbers = lineNumbers;
if(this.ColumnCount == 16) {
this.ctrlDataViewer.Header = "00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F";

4
GUI.NET/Debugger/Controls/ctrlTextbox.cs
View file

@ -302,6 +302,10 @@ namespace Mesen.GUI.Debugger
int marginLeft = this.GetMargin(g);
int positionX = position.X - marginLeft;
lineIndex = this.ScrollPosition + this.GetLineAtPosition(position.Y);
if(lineIndex > _contents.Length && _contents.Length != 0) {
lineIndex = _contents.Length - 1;
}
if(positionX >= 0 && lineIndex < _contents.Length) {
string text = _contents[lineIndex];
int previousWidth = 0;