Commit 85c2c138 authored by catboxanon's avatar catboxanon
Browse files

Attempt to read s_tmax from arg first if option not found

parent c11104fe
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -148,7 +148,7 @@ class StableDiffusionProcessing:
        self.s_min_uncond = s_min_uncond or opts.s_min_uncond
        self.s_min_uncond = s_min_uncond or opts.s_min_uncond
        self.s_churn = s_churn or opts.s_churn
        self.s_churn = s_churn or opts.s_churn
        self.s_tmin = s_tmin or opts.s_tmin
        self.s_tmin = s_tmin or opts.s_tmin
        self.s_tmax = opts.data.get('s_tmax', 0) or float('inf')  # not representable as a standard ui option
        self.s_tmax = opts.data.get('s_tmax', s_tmax or 0) or float('inf')  # not representable as a standard ui option
        self.s_noise = s_noise or opts.s_noise
        self.s_noise = s_noise or opts.s_noise
        self.override_settings = {k: v for k, v in (override_settings or {}).items() if k not in shared.restricted_opts}
        self.override_settings = {k: v for k, v in (override_settings or {}).items() if k not in shared.restricted_opts}
        self.override_settings_restore_afterwards = override_settings_restore_afterwards
        self.override_settings_restore_afterwards = override_settings_restore_afterwards