Add HandleWatchSizeSelected() to allow user-initiated watch size changes to be ignored if they reset the setting to the same value (#2862)

This commit is contained in:
Steven Schalek 2021-09-18 01:56:16 -07:00 committed by GitHub
parent 94f9016c6f
commit 478d886bec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions

View File

@ -631,6 +631,14 @@ namespace BizHawk.Client.EmuHawk
_searches.SetPreviousType(type); _searches.SetPreviousType(type);
} }
private void HandleWatchSizeSelected(WatchSize newWatchSize)
{
if (_settings.Size != newWatchSize)
{
SetSize(newWatchSize);
}
}
private void SetSize(WatchSize size) private void SetSize(WatchSize size)
{ {
_settings.Size = size; _settings.Size = size;
@ -1124,17 +1132,17 @@ namespace BizHawk.Client.EmuHawk
private void ByteMenuItem_Click(object sender, EventArgs e) private void ByteMenuItem_Click(object sender, EventArgs e)
{ {
SetSize(WatchSize.Byte); HandleWatchSizeSelected(WatchSize.Byte);
} }
private void WordMenuItem_Click(object sender, EventArgs e) private void WordMenuItem_Click(object sender, EventArgs e)
{ {
SetSize(WatchSize.Word); HandleWatchSizeSelected(WatchSize.Word);
} }
private void DWordMenuItem_Click_Click(object sender, EventArgs e) private void DWordMenuItem_Click_Click(object sender, EventArgs e)
{ {
SetSize(WatchSize.DWord); HandleWatchSizeSelected(WatchSize.DWord);
} }
private void CheckMisalignedMenuItem_Click(object sender, EventArgs e) private void CheckMisalignedMenuItem_Click(object sender, EventArgs e)
@ -1419,7 +1427,7 @@ namespace BizHawk.Client.EmuHawk
return; return;
} }
SetSize(SelectedSize); HandleWatchSizeSelected(SelectedSize);
} }
private void DisplayTypeDropdown_SelectedIndexChanged(object sender, EventArgs e) private void DisplayTypeDropdown_SelectedIndexChanged(object sender, EventArgs e)