From bcd7a85133d14c9cc8a48232bc00ad86dd8d9385 Mon Sep 17 00:00:00 2001
From: MikiraSora <mikirasora0409@126.com>
Date: Tue, 29 Oct 2024 05:35:54 +0800
Subject: [PATCH] GetCalculatableEvents() use
 CollectionHelper.MergeTwoSortedCollections()

---
 .../Base/Collections/SoflanList_CachedPositionList.cs         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OngekiFumenEditor/Base/Collections/SoflanList_CachedPositionList.cs b/OngekiFumenEditor/Base/Collections/SoflanList_CachedPositionList.cs
index c8be3104..fa2a64b3 100644
--- a/OngekiFumenEditor/Base/Collections/SoflanList_CachedPositionList.cs
+++ b/OngekiFumenEditor/Base/Collections/SoflanList_CachedPositionList.cs
@@ -69,8 +69,8 @@ private enum ChgEvt
 
         public IEnumerable<(TGrid TGrid, double speed, BPMChange curBpm)> GetCalculatableEvents(BpmList bpmList, bool isDesignModel)
         {
-            var sortList = new SortableCollection<(ITimelineObject timeline, ChgEvt evt), TGrid>(x => x.timeline.TGrid);
-            foreach (var timelineObject in this.FilterNull().AsEnumerable<ITimelineObject>().Concat(bpmList))
+            var sortList = new List<(ITimelineObject timeline, ChgEvt evt)>();
+            foreach (var timelineObject in CollectionHelper.MergeTwoSortedCollections<ITimelineObject, TGrid>(x => x.TGrid, this, bpmList))
             {
                 switch (timelineObject)
                 {