From 70cb1daacc26110caad8e1390c4af85995a0d77e Mon Sep 17 00:00:00 2001
From: psyGamer <psygamer21@gmail.com>
Date: Sat, 14 Dec 2024 14:52:07 +0100
Subject: [PATCH] fix(Studio): Force-combine inputs not being available

---
 .../CelesteStudio/Editing/ContextActions/CombineInputFrames.cs  | 2 +-
 Studio/CelesteStudio/Editing/PopupMenu.cs                       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Studio/CelesteStudio/Editing/ContextActions/CombineInputFrames.cs b/Studio/CelesteStudio/Editing/ContextActions/CombineInputFrames.cs
index 13ca8cbd..f02e27f8 100644
--- a/Studio/CelesteStudio/Editing/ContextActions/CombineInputFrames.cs
+++ b/Studio/CelesteStudio/Editing/ContextActions/CombineInputFrames.cs
@@ -119,7 +119,7 @@ public static bool CombineInputs(bool sameActions, bool dryRun = false) {
 
             if (!sameActions) {
                 // The algorithm goes backwards, but the target actions are the first valid line forwards
-                for (int row = minRow; row >= maxRow; row++) {
+                for (int row = minRow; row <= maxRow; row++) {
                     if (ActionLine.TryParse(Document.Lines[row], out var nextActionLine)) {
                         forceMergeTarget = nextActionLine;
                         break;
diff --git a/Studio/CelesteStudio/Editing/PopupMenu.cs b/Studio/CelesteStudio/Editing/PopupMenu.cs
index b36f95ab..9e81f30c 100644
--- a/Studio/CelesteStudio/Editing/PopupMenu.cs
+++ b/Studio/CelesteStudio/Editing/PopupMenu.cs
@@ -130,7 +130,6 @@ protected override void OnMouseDown(MouseEventArgs e) {
         protected override void OnMouseWheel(MouseEventArgs e) {
             // Update selected entry on scroll
             menu.Scroll += OnScroll;
-            Console.WriteLine(e.Delta.Height);
 
             if (Settings.Instance.ScrollSpeed > 0.0f) {
                 // Manually scroll to respect our scroll speed