Skip to content

Commit 22d6f30

Browse files
committed
Disabled 'Insert Bytes' menu when selecting a class
1 parent e4d420d commit 22d6f30

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

ReClass.NET/Forms/MainForm.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ private void selectedNodeContextMenuStrip_Opening(object sender, CancelEventArgs
495495
};
496496

497497
addBytesToolStripMenuItem.Enabled = parentNode != null || nodeIsClass;
498-
insertBytesToolStripMenuItem.Enabled = count == 1 && parentNode != null;
498+
insertBytesToolStripMenuItem.Enabled = count == 1 && parentNode != null && !nodeIsClass;
499499

500500
changeTypeToolStripMenuItem.Enabled = count > 0 && !nodeIsClass;
501501

@@ -829,11 +829,12 @@ private void memoryViewControl_SelectionChanged(object sender, EventArgs e)
829829

830830
var node = selectedNodes.FirstOrDefault()?.Node;
831831
var parentContainer = node?.GetParentContainer();
832+
var nodeIsClass = node is ClassNode;
832833

833-
addBytesToolStripDropDownButton.Enabled = parentContainer != null || node is ClassNode;
834-
insertBytesToolStripDropDownButton.Enabled = selectedNodes.Count == 1 && parentContainer != null;
834+
addBytesToolStripDropDownButton.Enabled = parentContainer != null || nodeIsClass;
835+
insertBytesToolStripDropDownButton.Enabled = selectedNodes.Count == 1 && parentContainer != null && !nodeIsClass;
835836

836-
var enabled = selectedNodes.Count > 0 && !(node is ClassNode);
837+
var enabled = selectedNodes.Count > 0 && !nodeIsClass;
837838
toolStrip.Items.OfType<TypeToolStripButton>().ForEach(b => b.Enabled = enabled);
838839
}
839840

ReClass.NET/Nodes/BaseContainerNode.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,8 @@ public void AddBytes(int size)
243243

244244
public void InsertBytes(BaseNode position, int size)
245245
{
246-
int index = FindNodeIndex(position);
247246
List<BaseNode> dummy = null;
248-
InsertBytes(index >= 0 ? index : 0, size, ref dummy);
247+
InsertBytes(FindNodeIndex(position), size, ref dummy);
249248
}
250249

251250
/// <summary>Inserts <paramref name="size"/> bytes at the specified position.</summary>

0 commit comments

Comments
 (0)