Merge pull request #24455 from mike-spa/portStuff

RomanPudashkin · web-flow · commit 508cde873074 · 2024-09-04T18:58:58.000+03:00
Merge pull request #24451 from mike-spa/fixHairpinError
diff --git a/src/engraving/dom/hairpin.cpp b/src/engraving/dom/hairpin.cpp
@@ -730,7 +730,7 @@ PointF Hairpin::linePos(Grip grip, System** system) const
 
     if (!start) {
         Fraction curTick = segment->tick();
-        Segment* prevSeg = segment->prev1(SegmentType::BarLineType);
+        Segment* prevSeg = segment->prev1(SegmentType::EndBarLine);
         if (prevSeg && prevSeg->tick() == curTick) {
             segment = prevSeg;
         }

Original file line number	Diff line number	Diff line change
`@@ -730,7 +730,7 @@ PointF Hairpin::linePos(Grip grip, System** system) const`
`730`	`730`
`731`	`731`	`if (!start) {`
`732`	`732`	`Fraction curTick = segment->tick();`
`733`		`- Segment* prevSeg = segment->prev1(SegmentType::BarLineType);`
	`733`	`+ Segment* prevSeg = segment->prev1(SegmentType::EndBarLine);`
`734`	`734`	`if (prevSeg && prevSeg->tick() == curTick) {`
`735`	`735`	`segment = prevSeg;`
`736`	`736`	`}`