PLMS edge-case handling fix 5

modules/processing.py

@@ -866,8 +866,6 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
 
         if self.hr_sampler == '---':
             pass
-        elif self.hr_sampler == 'PLMS':
-            img2img_sampler_name = 'DDIM'
         else:
             img2img_sampler_name = self.hr_sampler
 

modules/txt2img.py

@@ -38,7 +38,7 @@ def txt2img(id_task: str, prompt: str, negative_prompt: str, prompt_styles, step
         hr_second_pass_steps=hr_second_pass_steps,
         hr_resize_x=hr_resize_x,
         hr_resize_y=hr_resize_y,
-        hr_sampler=sd_samplers.samplers[hr_sampler_index - 1].name
+        hr_sampler=sd_samplers.samplers_for_img2img[hr_sampler_index - 1].name
         if hr_sampler_index != 0 else '---'
     )
 

modules/ui.py

@@ -673,7 +673,7 @@ def create_ui():
                                 hr_resize_y = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize height to", value=0, elem_id="txt2img_hr_resize_y")
 
                             with FormRow(elem_id="txt2img_hires_fix_row3", variant="compact"):
-                                hr_sampler_index = gr.Dropdown(label='Hires sampling method', elem_id=f"hr_sampler", choices=["---"] + [x.name for x in samplers], value="---", type="index")
+                                hr_sampler_index = gr.Dropdown(label='Hires sampling method', elem_id=f"hr_sampler", choices=["---"] + [x.name for x in samplers_for_img2img], value="---", type="index")
 
                     elif category == "batch":
                         if not opts.dimensions_and_batch_together: