Merge branch 'dev' into js-misc-fixes

2 files changed, 9 insertions, 3 deletions

diff --git a/modules/processing.py b/modules/processing.py
index a48fff99..e8808beb 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -498,6 +498,11 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
     stored_opts = {k: opts.data[k] for k in p.override_settings.keys()}

 

     try:

+        # if no checkpoint override or the override checkpoint can't be found, remove override entry and load opts checkpoint

+        if sd_models.checkpoint_alisases.get(p.override_settings.get('sd_model_checkpoint')) is None:

+            p.override_settings.pop('sd_model_checkpoint', None)

+            sd_models.reload_model_weights()

+

         for k, v in p.override_settings.items():

             setattr(opts, k, v)

 

@@ -514,8 +519,6 @@ def process_images(p: StableDiffusionProcessing) -> Processed:
         if p.override_settings_restore_afterwards:

             for k, v in stored_opts.items():

                 setattr(opts, k, v)

-                if k == 'sd_model_checkpoint':

-                    sd_models.reload_model_weights()

 

                 if k == 'sd_vae':

                     sd_vae.reload_vae_weights()

diff --git a/modules/ui.py b/modules/ui.py
index 9ff4bcd9..7b45f131 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -810,7 +810,10 @@ def create_ui():
                                     scale_by.release(**on_change_args)

                                     button_update_resize_to.click(**on_change_args)

 

-                                    for component in img2img_image_inputs:

+                                    # the code below is meant to update the resolution label after the image in the image selection UI has changed.

+                                    # as it is now the event keeps firing continuously for inpaint edits, which ruins the page with constant requests.

+                                    # I assume this must be a gradio bug and for now we'll just do it for non-inpaint inputs.

+                                    for component in [init_img, sketch]:

                                         component.change(fn=lambda: None, _js="updateImg2imgResizeToTextAfterChangingImage", inputs=[], outputs=[], show_progress=False)

 

                             tab_scale_to.select(fn=lambda: 0, inputs=[], outputs=[selected_scale_tab])