diff --git a/GUI.NET/Controls/MyListView.cs b/GUI.NET/Controls/MyListView.cs index 782b7488..9ff9699e 100644 --- a/GUI.NET/Controls/MyListView.cs +++ b/GUI.NET/Controls/MyListView.cs @@ -128,5 +128,11 @@ namespace Mesen.GUI.Controls { this.DoubleBuffered = true; } + + protected override void OnVirtualItemsSelectionRangeChanged(ListViewVirtualItemsSelectionRangeChangedEventArgs e) + { + base.OnVirtualItemsSelectionRangeChanged(e); + base.OnSelectedIndexChanged(e); + } } } diff --git a/GUI.NET/Debugger/Controls/ctrlLabelList.cs b/GUI.NET/Debugger/Controls/ctrlLabelList.cs index 034327e5..e7eb5226 100644 --- a/GUI.NET/Debugger/Controls/ctrlLabelList.cs +++ b/GUI.NET/Debugger/Controls/ctrlLabelList.cs @@ -195,7 +195,7 @@ namespace Mesen.GUI.Debugger.Controls int topIndex = lstLabels.TopItem.Index; int lastSelectedIndex = lstLabels.SelectedIndices[lstLabels.SelectedIndices.Count - 1]; for(int i = lstLabels.SelectedIndices.Count - 1; i >= 0; i--) { - CodeLabel label = (CodeLabel)GetSelectedItem().SubItems[1].Tag; + CodeLabel label = (CodeLabel)_listItems[lstLabels.SelectedIndices[i]].SubItems[1].Tag; LabelManager.DeleteLabel(label.Address, label.AddressType, i == 0); }