From 8731159e32d97bcd1572f80ccdd6a10c954865e8 Mon Sep 17 00:00:00 2001 From: veroxzik <43590004+veroxzik@users.noreply.github.com> Date: Sat, 12 Nov 2022 21:27:51 -0500 Subject: [PATCH] Fix crash when deleting Hold Start note. --- BAKKA-Editor/MainForm.cs | 5 +++++ BAKKA-Editor/Operations/NoteOperation.cs | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/BAKKA-Editor/MainForm.cs b/BAKKA-Editor/MainForm.cs index 0f7c02d..e0dd31d 100644 --- a/BAKKA-Editor/MainForm.cs +++ b/BAKKA-Editor/MainForm.cs @@ -1822,6 +1822,11 @@ namespace BAKKA_Editor SetNonHoldButtonState(true); SetSelectedObject(NoteType.HoldJoint); } + if (isRemoveHold) + { + SetNonHoldButtonState(true); + SetSelectedObject(note.NoteType); + } } else if (note.NoteType == NoteType.HoldJoint) { diff --git a/BAKKA-Editor/Operations/NoteOperation.cs b/BAKKA-Editor/Operations/NoteOperation.cs index e11ea01..91a5f31 100644 --- a/BAKKA-Editor/Operations/NoteOperation.cs +++ b/BAKKA-Editor/Operations/NoteOperation.cs @@ -138,8 +138,11 @@ namespace BAKKA_Editor.Operations { case NoteType.HoldStartNoBonus: case NoteType.HoldStartBonusFlair: - nextNote.PrevNote = null; - nextNote.NoteType = Note.NoteType; + if (nextNote != null) + { + nextNote.PrevNote = null; + nextNote.NoteType = Note.NoteType; + } break; case NoteType.HoldJoint: prevNote.NextNote = nextNote; @@ -162,8 +165,11 @@ namespace BAKKA_Editor.Operations { case NoteType.HoldStartNoBonus: case NoteType.HoldStartBonusFlair: - nextNote.PrevNote = Note; - nextNote.NoteType = nextNoteType; + if (nextNote != null) + { + nextNote.PrevNote = Note; + nextNote.NoteType = nextNoteType; + } break; case NoteType.HoldJoint: prevNote.NextNote = Note;