From 178c98b142c0db9e46de03991545a1259d5706bc Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Sun, 15 Aug 2021 18:37:07 +0200
Subject: fix commands on multiple import (#1306)

---
 lib/commands.py      | 4 ++--
 lib/svg/rendering.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/commands.py b/lib/commands.py
index 3e28086c..8fccc63f 100644
--- a/lib/commands.py
+++ b/lib/commands.py
@@ -297,7 +297,7 @@ def add_connector(document, symbol, element):
 
     # Make sure the element's XML node has an id so that we can reference it.
     if element.node.get('id') is None:
-        element.node.set('id', generate_unique_id(document, "object"))
+        element.node.set('id', document.get_unique_id("object"))
 
     path = inkex.PathElement(attrib={
         "id": generate_unique_id(document, "command_connector"),
@@ -316,7 +316,7 @@ def add_connector(document, symbol, element):
 
 def add_symbol(document, group, command, pos):
     symbol = inkex.Use(attrib={
-        "id": generate_unique_id(document, "command_use"),
+        "id": document.get_unique_id("command_use"),
         XLINK_HREF: "#inkstitch_%s" % command,
         "height": "100%",
         "width": "100%",
diff --git a/lib/svg/rendering.py b/lib/svg/rendering.py
index 7be1e8b0..2b638ebf 100644
--- a/lib/svg/rendering.py
+++ b/lib/svg/rendering.py
@@ -197,8 +197,8 @@ def color_block_to_paths(color_block, svg, destination, visual_commands):
             add_commands(Stroke(destination[-1]), ["trim"])
 
         color = color_block.color.visible_on_white.to_hex_str()
-
         path = inkex.PathElement(attrib={
+            'id': svg.get_unique_id("object"),
             'style': "stroke: %s; stroke-width: 0.4; fill: none;" % color,
             'd': "M" + " ".join(" ".join(str(coord) for coord in point) for point in point_list),
             'transform': get_correction_transform(svg),
-- 
cgit v1.2.3