libretro/Mesen
1
0
Fork 0
mirror of https://github.com/libretro/Mesen.git synced 2025-02-13 12:54:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Linux: Fixed UI crash in memory tools (GetDataObject returns null)

Browse Source
This commit is contained in:
Sour 2018-06-10 14:13:35 -04:00
parent a17eb67cad
commit 82386e974f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
GUI.NET/Debugger/HexBox/HexBox.cs
View File

@ -2212,11 +2212,11 @@ namespace Be.Windows.Forms
byte[] buffer = null;
IDataObject da = Clipboard.GetDataObject();
if(da.GetDataPresent("BinaryData")) {
if(da != null && da.GetDataPresent("BinaryData")) {
System.IO.MemoryStream ms = (System.IO.MemoryStream)da.GetData("BinaryData");
buffer = new byte[ms.Length];
ms.Read(buffer, 0, buffer.Length);
} else if(da.GetDataPresent(typeof(string))) {
} else if(da != null && da.GetDataPresent(typeof(string))) {
string sBuffer = (string)da.GetData(typeof(string));
buffer = System.Text.Encoding.ASCII.GetBytes(sBuffer);
} else {
@ -2240,6 +2240,9 @@ namespace Be.Windows.Forms
if (ReadOnly || !this.Enabled) return false;
IDataObject da = Clipboard.GetDataObject();
if(da == null) {
return false;
}
if (da.GetDataPresent("BinaryData"))
return true;
else if (da.GetDataPresent(typeof(string)))
@ -2256,6 +2259,9 @@ namespace Be.Windows.Forms
byte[] buffer = null;
IDataObject da = Clipboard.GetDataObject();
if(da == null) {
return false;
}
if (da.GetDataPresent(typeof(string)))
{
string hexString = (string)da.GetData(typeof(string));
@ -2274,7 +2280,7 @@ namespace Be.Windows.Forms
byte[] buffer = null;
IDataObject da = Clipboard.GetDataObject();
if (da.GetDataPresent(typeof(string)))
if (da != null && da.GetDataPresent(typeof(string)))
{
string hexString = (string)da.GetData(typeof(string));
buffer = ConvertHexToBytes(hexString);