1 files changed, 23 insertions, 7 deletions
diff --git a/lib/stitch_plan/stop.py b/lib/stitch_plan/stop.py
index c5e9f7e4..81dec1da 100644
--- a/lib/stitch_plan/stop.py
+++ b/lib/stitch_plan/stop.py
@@ -5,23 +5,39 @@ def process_stop(color_block):
     be useful for applique and similar on multi-needle machines that
     normally would not stop between colors.
 
-    On such machines, the user assigns needles to the colors in the
-    design before starting stitching.  C01, C02, etc are normal
+    In machine embroidery files, there's no such thing as an actual
+    "STOP" instruction.  All that exists is a "color change" command
+    (which libembroidery calls STOP just to be confusing).
+
+    On multi-needle machines, the user assigns needles to the colors in
+    the design before starting stitching.  C01, C02, etc are normal
     needles, but C00 is special.  For a block of stitches assigned
     to C00, the machine will continue sewing with the last color it
     had and pause after it completes the C00 block.
 
-    That means we need to introduce an artificial color change
-    shortly before the current stitch so that the user can set that
-    to C00.  We'll go back 3 stitches and do that:
+    That means we need to add an artificial color change instruction
+    shortly before the current stitch so that the user can set that color
+    block to C00.  We'll go back 3 stitches and mark the start of the C00
+    block:
     """
 
     if len(color_block.stitches) >= 3:
-        color_block.stitches[-3].stop = True
+        # make a copy of the stitch and set it as a color change
+        stitch = color_block.stitches[-3].copy()
+        stitch.color_change = True
+
+        # mark this stitch as a "stop" so that we can avoid
+        # adding tie stitches in ties.py
+        stitch.stop = True
+
+        # insert it after the stitch
+        color_block.stitches.insert(-2, stitch)
 
     # and also add a color change on this stitch, completing the C00
     # block:
 
-    color_block.stitches[-1].stop = True
+    stitch = color_block.stitches[-1].copy()
+    stitch.color_change = True
+    color_block.add_stitch(stitch)
 
     # reference for the above: https://github.com/lexelby/inkstitch/pull/29#issuecomment-359175447