Merge pull request #2032 from inkstitch/kaalleen/short-stitch-fix

fix short stitch for second rail

lib/elements/satin_column.py

@@ -1013,7 +1013,7 @@ class SatinColumn(EmbroideryElement):
             self.zigzag_spacing,
             self.pull_compensation_px,
             self.pull_compensation_percent/100,
-            self.random_width_decrease.any() and self.random_width_increase.any() and self.random_zigzag_spacing,
+            self.random_width_decrease.any() or self.random_width_increase.any() or self.random_zigzag_spacing,
         )
 
         # "left" and "right" here are kind of arbitrary designations meaning
@@ -1068,7 +1068,7 @@ class SatinColumn(EmbroideryElement):
             offset_px = [0, 0]
             if a.distance(pairs[i-1][0]) < min_dist:
                 offset_px[0] = -inset_px
-            if b.distance(pairs[i-1][0]) < min_dist:
+            if b.distance(pairs[i-1][1]) < min_dist:
                 offset_px[1] = -inset_px
             shortened.append(self.offset_points(a, b, offset_px, (0, 0)))
         return shortened