diff --git a/PKX/f1-Main.cs b/PKX/f1-Main.cs index edfb11847..b59642fb8 100644 --- a/PKX/f1-Main.cs +++ b/PKX/f1-Main.cs @@ -61,8 +61,7 @@ public Main() foreach (PictureBox pb in PAN_Box.Controls) { pb.AllowDrop = true; - pb.DragDrop += tabMain_DragDrop; - pb.DragEnter += tabMain_DragEnter; + // The PictureBoxes have their own drag&drop event handlers. } foreach (TabPage tab in tabMain.TabPages) { @@ -3314,7 +3313,9 @@ private void pbBoxSlot_DragDrop(object sender, DragEventArgs e) } private void pbBoxSlot_DragEnter(object sender, DragEventArgs e) { - if (e.Data != null) + if (e.AllowedEffect == (DragDropEffects.Copy | DragDropEffects.Link)) // external file + e.Effect = DragDropEffects.Copy; + else if (e.Data != null) // within e.Effect = DragDropEffects.Move; } private byte[] pkm_from = (byte[])blankEK6.Clone();