From bfce719cde32681cbfae20daae3c224f82949484 Mon Sep 17 00:00:00 2001
From: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
Date: Mon, 29 Jan 2024 17:44:23 -0700
Subject: [PATCH] no breaking note types with undos now !!

---
 source/funkin/editors/charter/Charter.hx          | 4 ++--
 source/funkin/editors/charter/CharterStrumline.hx | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/funkin/editors/charter/Charter.hx b/source/funkin/editors/charter/Charter.hx
index c1c468b2..4f228278 100644
--- a/source/funkin/editors/charter/Charter.hx
+++ b/source/funkin/editors/charter/Charter.hx
@@ -1180,7 +1180,7 @@ class Charter extends UIState {
 	}
 
 	function _edit_undo(_) {
-		if (strumLines.isDragging || selectionDragging) return;
+		if (strumLines.isDragging || selectionDragging || subState != null) return;
 		
 		selection = [];
 		var undo = undos.undo();
@@ -1226,7 +1226,7 @@ class Charter extends UIState {
 	}
 
 	function _edit_redo(_) {
-		if (strumLines.isDragging || selectionDragging) return;
+		if (strumLines.isDragging || selectionDragging || subState != null) return;
 
 		selection = [];
 		var redo = undos.redo();
diff --git a/source/funkin/editors/charter/CharterStrumline.hx b/source/funkin/editors/charter/CharterStrumline.hx
index 4f23c1d1..d08d14ff 100644
--- a/source/funkin/editors/charter/CharterStrumline.hx
+++ b/source/funkin/editors/charter/CharterStrumline.hx
@@ -146,15 +146,15 @@ class CharterStrumlineOptions extends UITopMenuButton {
 				onSelect: function (_) {
 					Charter.instance.editStrumline(strLine.strumLine);
 				},
-				color: 0xFFFFFF00,
-				icon: 2
+				color: 0xFF959829,
+				icon: 4
 			},
 			{
 				label: "Delete",
 				onSelect: function (_) {
 					Charter.instance.deleteStrumlineFromData(strLine.strumLine);
 				},
-				color: 0xFFFF0000,
+				color: 0xFF982929,
 				icon: 3
 			},
 			null,