Merge branch 'master' into #1484_fix_empty_styles_pattern

1 files changed, 6 insertions, 2 deletions

diff --git a/modules/sd_samplers.py b/modules/sd_samplers.py
index 92522214..9316875a 100644
--- a/modules/sd_samplers.py
+++ b/modules/sd_samplers.py
@@ -77,7 +77,9 @@ def extended_tdqm(sequence, *args, desc=None, **kwargs):
     state.sampling_steps = len(sequence)

     state.sampling_step = 0

 

-    for x in tqdm.tqdm(sequence, *args, desc=state.job, file=shared.progress_print_out, **kwargs):

+    seq = sequence if cmd_opts.disable_console_progressbars else tqdm.tqdm(sequence, *args, desc=state.job, file=shared.progress_print_out, **kwargs)

+

+    for x in seq:

         if state.interrupted:

             break

 

@@ -207,7 +209,9 @@ def extended_trange(sampler, count, *args, **kwargs):
     state.sampling_steps = count

     state.sampling_step = 0

 

-    for x in tqdm.trange(count, *args, desc=state.job, file=shared.progress_print_out, **kwargs):

+    seq = range(count) if cmd_opts.disable_console_progressbars else tqdm.trange(count, *args, desc=state.job, file=shared.progress_print_out, **kwargs)

+

+    for x in seq:

         if state.interrupted:

             break