fix conflicts

1 files changed, 9 insertions, 1 deletions

diff --git a/modules/ui.py b/modules/ui.py
index 4e136ef5..30583fe9 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -192,6 +192,7 @@ def wrap_gradio_call(func, extra_outputs=None):
         # last item is always HTML

         res[-1] += f"<div class='performance'><p class='time'>Time taken: <wbr>{elapsed_text}</p>{vram_html}</div>"

 

+        shared.state.skipped = False

         shared.state.interrupted = False

         shared.state.job_count = 0

 

@@ -417,9 +418,16 @@ def create_toprow(is_img2img):
 

         with gr.Column(scale=1):

             with gr.Row():

+                skip = gr.Button('Skip', elem_id=f"{id_part}_skip")

                 interrupt = gr.Button('Interrupt', elem_id=f"{id_part}_interrupt")

                 submit = gr.Button('Generate', elem_id=f"{id_part}_generate", variant='primary')

 

+                skip.click(

+                    fn=lambda: shared.state.skip(),

+                    inputs=[],

+                    outputs=[],

+                )

+

                 interrupt.click(

                     fn=lambda: shared.state.interrupt(),

                     inputs=[],

@@ -952,7 +960,7 @@ def create_ui(wrap_gradio_gpu_call):
                 custom_name = gr.Textbox(label="Custom Name (Optional)")

                 interp_amount = gr.Slider(minimum=0.0, maximum=1.0, step=0.05, label='Interpolation Amount', value=0.3)

                 interp_method = gr.Radio(choices=["Weighted Sum", "Sigmoid", "Inverse Sigmoid"], value="Weighted Sum", label="Interpolation Method")

-                save_as_half = gr.Checkbox(value=False, label="Safe as float16")

+                save_as_half = gr.Checkbox(value=False, label="Save as float16")

                 modelmerger_merge = gr.Button(elem_id="modelmerger_merge", label="Merge", variant='primary')

 

             with gr.Column(variant='panel'):