Merge pull request #391 from ryohey/fix-first-time-signature

Fix issue where time signature could not be added
ryohey · Aug 17, 2024 · 50f81c7 · 50f81c7
2 parents ea8fcf4 + 10078ad
commit 50f81c7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/app/src/actions/track.ts b/app/src/actions/track.ts
@@ -358,22 +358,22 @@ export const toogleAllGhostTracks =
 export const addTimeSignature =
   ({ song, pushHistory }: RootStore) =>
   (tick: number, numerator: number, denominator: number) => {
-    const measureStart = Measure.getMeasureStart(
+    const measureStartTick = Measure.getMeasureStart(
       song.measures,
       tick,
       song.timebase,
-    )
+    ).tick
 
     // prevent duplication
-    if (measureStart.eventTick === measureStart.tick) {
+    if (song.timeSignatures?.some((e) => e.tick === measureStartTick)) {
       return
     }
 
     pushHistory()
 
     song.conductorTrack?.addEvent({
       ...timeSignatureMidiEvent(0, numerator, denominator),
-      tick: measureStart.tick,
+      tick: measureStartTick,
     })
   }