From 6828b854f5b98900145570eeb2521a2d4008bada Mon Sep 17 00:00:00 2001
From: hithereai <121192995+hithereai@users.noreply.github.com>
Date: Sun, 5 Mar 2023 20:15:22 +0200
Subject: [PATCH 1/3] Revert "Merge pull request #422 from
 hithereai/sampler_sch_fixes"

This reverts commit 09c99d10edc82583afba63f21282fc7d3e9663a1, reversing
changes made to 97ab68b13bd0dbf245916748e5e68f6246a303de.
---
 scripts/deforum_helpers/generate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/deforum_helpers/generate.py b/scripts/deforum_helpers/generate.py
index 4f1bb25a..8868b956 100644
--- a/scripts/deforum_helpers/generate.py
+++ b/scripts/deforum_helpers/generate.py
@@ -241,7 +241,7 @@ def print_combined_table(args, anim_args, p, keys, frame_idx):
         rows1.append(f"{p.denoising_strength:.5g}" if p.denoising_strength is not None else "None")
 
     rows1 += [str(p.subseed), f"{p.subseed_strength:.5g}"] * (anim_args.enable_subseed_scheduling)
-    rows1 += [args.sampler] * anim_args.enable_sampler_scheduling
+    rows1 += [p.sampler_name] * anim_args.enable_sampler_scheduling
     rows1 += [str(args.checkpoint)] * anim_args.enable_checkpoint_scheduling
     
     rows2 = []

From 91b1f640872b58198cc94a86208c6d146f25e47d Mon Sep 17 00:00:00 2001
From: hithereai <121192995+hithereai@users.noreply.github.com>
Date: Sun, 5 Mar 2023 20:50:37 +0200
Subject: [PATCH 2/3] fix first frame sampler with sampler_sch ON

---
 scripts/deforum_helpers/generate.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/deforum_helpers/generate.py b/scripts/deforum_helpers/generate.py
index 8868b956..6144e839 100644
--- a/scripts/deforum_helpers/generate.py
+++ b/scripts/deforum_helpers/generate.py
@@ -123,7 +123,9 @@ def generate(args, keys, anim_args, loop_args, controlnet_args, root, frame = 0,
     }
     if sampler_name is not None:
         if sampler_name in available_samplers.keys():
-            args.sampler = available_samplers[sampler_name]
+            p.sampler_name = available_samplers[sampler_name]
+        else:
+            raise RuntimeError(f"Sampler name '{sampler_name}' is invalid. Please check the available sampler list in the 'Run' tab")
 
     if args.checkpoint is not None:
         info = sd_models.get_closet_checkpoint_match(args.checkpoint)

From 8e313631aa28166326a6dbb858003ce280fae1d6 Mon Sep 17 00:00:00 2001
From: hithereai <121192995+hithereai@users.noreply.github.com>
Date: Sun, 5 Mar 2023 20:57:00 +0200
Subject: [PATCH 3/3] better skipping video cli message

---
 scripts/deforum.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/deforum.py b/scripts/deforum.py
index 3db01b36..0ca85010 100644
--- a/scripts/deforum.py
+++ b/scripts/deforum.py
@@ -105,7 +105,7 @@ def run_deforum(*args, **kwargs):
         need_to_frame_interpolate = True
         
     if video_args.skip_video_for_run_all:
-        print('Skipping video creation, uncheck skip_video_for_run_all if you want to run it')
+        print("\nSkipping video creation, uncheck 'Skip video for run all' in 'Output' tab if you want to get a video too :)")
     else:
         import subprocess