From 2e02e7360315e2cedbd318246c0723bab5b7a3e9 Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Sat, 31 Aug 2024 19:03:11 -0400
Subject: [PATCH] handle duplicate peft

---
 extensions-builtin/Lora/networks.py | 15 +++++++++++----
 wiki                                |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/extensions-builtin/Lora/networks.py b/extensions-builtin/Lora/networks.py
index 847d46632..004b2605e 100644
--- a/extensions-builtin/Lora/networks.py
+++ b/extensions-builtin/Lora/networks.py
@@ -97,10 +97,17 @@ def load_diffusers(name, network_on_disk, lora_scale=1.0) -> network.Network:
     try:
         shared.sd_model.load_lora_weights(network_on_disk.filename, adapter_name=name)
     except Exception as e:
-        errors.display(e, "LoRA")
-        return None
-    diffuser_loaded.append(name)
-    diffuser_scales.append(lora_scale)
+        if 'already in use' in str(e):
+            # shared.log.warning(f"LoRA load failed: file={network_on_disk.filename} {e}")
+            pass
+        else:
+            shared.log.error(f"LoRA load failed: file={network_on_disk.filename} {e}")
+            if debug:
+                errors.display(e, "LoRA")
+            return None
+    if name not in diffuser_loaded:
+        diffuser_loaded.append(name)
+        diffuser_scales.append(lora_scale)
     net = network.Network(name, network_on_disk)
     net.mtime = os.path.getmtime(network_on_disk.filename)
     # lora_cache[name] = net
diff --git a/wiki b/wiki
index cf1e6bbb5..173053068 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit cf1e6bbb5b476007081b6a29f9d65f185b49b629
+Subproject commit 17305306868845c93c70090749723e7f4abbb26f