Origin: upstream, commit:922e514e4922338741bb75edafc555523f76d35c
Author: James Thistlewood <jamesthistlewood@gmail.com>
Description: fix #292960: hairpin with dynamics at the end is too short

--- a/libmscore/hairpin.cpp
+++ b/libmscore/hairpin.cpp
@@ -103,11 +103,12 @@ void HairpinSegment::layout()
       Dynamic* ed = nullptr;
       qreal dymax = hairpin()->placeBelow() ? -10000.0 : 10000.0;
       if (autoplace() && !score()->isPalette()) {
+            Segment* start = hairpin()->startSegment();
+            Segment* end = hairpin()->endSegment();
             // Try to fit between adjacent dynamics
             qreal minDynamicsDistance = score()->styleP(Sid::autoplaceHairpinDynamicsDistance) * staff()->mag(tick());
             const System* sys = system();
             if (isSingleType() || isBeginType()) {
-                  Segment* start = hairpin()->startSegment();
                   if (start && start->system() == sys) {
                         sd = toDynamic(start->findAnnotation(ElementType::DYNAMIC, _trck, _trck));
                         if (!sd) {
@@ -130,8 +131,7 @@ void HairpinSegment::layout()
                         }
                   }
             if (isSingleType() || isEndType()) {
-                  Segment* end = hairpin()->endSegment();
-                  if (end && end->tick() < sys->endTick()) {
+                  if (end && end->tick() < sys->endTick() && start != end) {
                         // checking ticks rather than systems
                         // systems may be unknown at layout stage.
                         ed = toDynamic(end->findAnnotation(ElementType::DYNAMIC, _trck, _trck));
@@ -176,14 +176,13 @@ void HairpinSegment::layout()
             qreal h1 = hairpin()->hairpinHeight().val()     * _spatium * .5;
             qreal h2 = hairpin()->hairpinContHeight().val() * _spatium * .5;
 
-            qreal len;
             qreal x = pos2().x();
             if (!_endText->empty())
                   x -= (_endText->width() + _spatium * .5);       // 0.5 spatium distance
             if (x < _spatium)             // minimum size of hairpin
                   x = _spatium;
             qreal y = pos2().y();
-            len     = sqrt(x * x + y * y);
+            qreal len = sqrt(x * x + y * y);
             t.rotateRadians(asin(y/len));
 
             drawCircledTip   =  hairpin()->hairpinCircledTip();