Merge remote-tracking branch 'origin/dev' into soft-inpainting

# Conflicts:
#	modules/processing.py

1 files changed, 5 insertions, 2 deletions

diff --git a/extensions-builtin/Lora/ui_extra_networks_lora.py b/extensions-builtin/Lora/ui_extra_networks_lora.py
index 55409a78..df02c663 100644
--- a/extensions-builtin/Lora/ui_extra_networks_lora.py
+++ b/extensions-builtin/Lora/ui_extra_networks_lora.py
@@ -17,6 +17,8 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
 

     def create_item(self, name, index=None, enable_filter=True):

         lora_on_disk = networks.available_networks.get(name)

+        if lora_on_disk is None:

+            return

 

         path, ext = os.path.splitext(lora_on_disk.filename)

 

@@ -66,9 +68,10 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage):
         return item

 

     def list_items(self):

-        for index, name in enumerate(networks.available_networks):

+        # instantiate a list to protect against concurrent modification

+        names = list(networks.available_networks)

+        for index, name in enumerate(names):

             item = self.create_item(name, index)

-

             if item is not None:

                 yield item