diff --git a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index cb46c6270b..b3cb6a3fdd 100644 --- a/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/src/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -188,7 +188,7 @@ namespace BizHawk.Client.EmuHawk private IEnumerable SelectedSeparators => SelectedItems.Where(x => x.IsSeparator); private bool MayPokeAllSelected - => WatchListView.AnyRowsSelected && SelectedWatches.All(static w => w.Domain.Writable); + => SelectedWatches.Any() && SelectedWatches.All(static w => w.Domain.Writable); public IEnumerable Watches => _watches.Where(x => !x.IsSeparator); @@ -1114,7 +1114,7 @@ namespace BizHawk.Client.EmuHawk } private bool MaySplitAllSelected - => WatchListView.AnyRowsSelected && SelectedWatches.All(static w => w.IsSplittable); + => SelectedWatches.Any() && SelectedWatches.All(static w => w.IsSplittable); private void ListViewContextMenu_Opening(object sender, CancelEventArgs e) { @@ -1141,6 +1141,8 @@ namespace BizHawk.Client.EmuHawk = Debuggable?.MemoryCallbacksAvailable() is true && SelectedWatches.Any() && SelectedWatches.All(w => w.Domain.Name == sysBusName); + DuplicateContextMenuItem.Enabled = SelectedWatches.Any(); + SplitContextMenuItem.Enabled = MaySplitAllSelected; PokeContextMenuItem.Enabled =