ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/TASVideos/BizHawk

This commit is contained in:
alyosha-tas 2019-04-21 15:29:22 -04:00
parent 27460c26ae 2bb63c2bf1
commit 1e4a0da15e
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
View File

@ -1196,7 +1196,7 @@ namespace BizHawk.Client.EmuHawk
if (AllowRightClickSelecton && e.Button == MouseButtons.Right)
{
if (!IsHoveringOnColumnCell)
if (!IsHoveringOnColumnCell && CurrentCell != null)
{
_currentX = e.X;
_currentY = e.Y;

33
BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
View File

@ -927,32 +927,31 @@ namespace BizHawk.Client.EmuHawk
Message = "Enter a hexadecimal value"
};
var result = prompt.ShowHawkDialog();
if (result == DialogResult.OK)
while (prompt.ShowHawkDialog() == DialogResult.OK)
{
if (prompt.PromptText.IsHex())
try
{
int addr;
try
{
addr = int.Parse(prompt.PromptText, NumberStyles.HexNumber);
}
catch (OverflowException e)
{
//TODO repeat dialog `prompt` / show error?
return;
}
var addr = int.Parse(prompt.PromptText, NumberStyles.HexNumber);
for (int index = 0; index < _searches.Count; index++)
{
if (addr == _searches[index].Address)
if (_searches[index].Address == addr)
{
WatchListView.SelectItem(index, true);
WatchListView.ensureVisible();
break;
return; // Don't re-show dialog on success
}
}
//TODO add error text to dialog?
// Re-show dialog if the address isn't found
}
catch (FormatException e)
{
// Re-show dialog if given invalid text (shouldn't happen)
}
catch (OverflowException e)
{
//TODO add error text to dialog?
// Re-show dialog if the address isn't valid
}
}
}