fix facehires with control batch count

CHANGELOG.md

@@ -59,14 +59,19 @@
   subsequent runs will check package versions as necessary  
 - add env variable `SD_PIP_DEBUG` to write `pip.log` for all pip operations  
   also improved installer logging  
-- add python version check for `torch-directml`
+- add python version check for `torch-directml`  
 - do not install `tensorflow` by default  
 - improve metadata/infotext parser  
   add `cli/image-exif.py` that can be used to view/extract metadata from images  
-- lower overhead on generate calls
+- lower overhead on generate calls  
 - auto-synchronize modernui and core branches  
-- fix apply/unapply hidiffusion for sd15  
+
+## Fixes
+
 - cumulative fixes since the last release
+- fix apply/unapply hidiffusion for sd15  
+- fix controlnet reference enabled check  
+- fix face-hires with control batch count  
 
 ## Update for 2024-06-02
 

scripts/face-details.py

@@ -137,8 +137,10 @@ class FaceRestorerYolo(FaceRestoration):
             'width': resolution,
             'height': resolution,
         }
+        control_pipeline = None
         if getattr(p, 'is_control', False):
             from modules.control import run
+            control_pipeline = shared.sd_model
             run.restore_pipeline()
 
         p = processing_class.switch_class(p, processing.StableDiffusionProcessingImg2Img, args)
@@ -171,6 +173,8 @@ class FaceRestorerYolo(FaceRestoration):
                     mask_all.append(pp.images[1])
 
         # restore pipeline
+        if control_pipeline is not None:
+            shared.sd_model = control_pipeline
         p = processing_class.switch_class(p, orig_cls, orig_p)
         p.init_images = getattr(orig_p, 'init_images', None)
         p.image_mask = getattr(orig_p, 'image_mask', None)