Update !1-custom-hires-fix-mod-for-automatic1111-2.9.5/scripts/!!custom_hires_fix.py

!1-custom-hires-fix-mod-for-automatic1111-2.9.5/scripts/!!custom_hires_fix.py

@@ -2376,17 +2376,22 @@ class CustomHiresFix(scripts.Script):
         """
         Вешает временный колбэк на on_cfg_denoiser и снимает его по выходу из контекста.
         На/после limit_steps:
-          - выставляет shared.state.interrupt = True (мягко)
+          - выставляет shared.state.interrupted = True (мягко)
           - кидает sd_samplers_common.InterruptedException() (жёстко, как Anti-Burn)
+
+        ВАЖНО: используем shared.state.interrupted (bool-флаг), а НЕ
+        shared.state.interrupt (это метод в A1111). Перезапись метода булем
+        ломает кнопку Interrupt в UI с TypeError: 'bool' object is not callable.
         """
         cb_ref = None
         limit_steps = int(max(1, limit_steps))
 
-        # Save interrupt state so we can reliably restore it even if we set it ourselves.
+        # Save interrupted flag so we can reliably restore it even if we set it ourselves.
+        # NB: getattr with bool default — interrupt is a method, interrupted is the flag.
         try:
-            prev_interrupt = bool(getattr(shared.state, "interrupt", False))
+            prev_interrupted = bool(getattr(shared.state, "interrupted", False))
         except Exception:
-            prev_interrupt = False
+            prev_interrupted = False
 
         try:
             def _cb(params):
@@ -2397,7 +2402,7 @@ class CustomHiresFix(scripts.Script):
                     # params.sampling_step обычно 0-based → останавливаем на «человеческом» шаге
                     if (int(step) + 1) >= limit_steps:
                         try:
-                            shared.state.interrupt = True  # на всякий случай — мягкий флаг
+                            shared.state.interrupted = True  # мягкий флаг
                         except Exception:
                             pass
                         # жёсткий способ, как в Anti-Burn:
@@ -2434,9 +2439,9 @@ class CustomHiresFix(scripts.Script):
                             pass
                 except Exception as e:
                     logger.warning(f"stop-hook remove warning: {e}")
-            # Restore interrupt flag to avoid leaking into subsequent generations
+            # Restore interrupted flag to avoid leaking into subsequent generations
             try:
-                shared.state.interrupt = prev_interrupt
+                shared.state.interrupted = prev_interrupted
             except Exception:
                 pass
 
@@ -2510,11 +2515,15 @@ class CustomHiresFix(scripts.Script):
                     sample = F.interpolate(sample, size=(sh, sw), mode="bicubic", align_corners=False, antialias=True)
                     sample = F.interpolate(sample, size=(h, w),  mode="bicubic", align_corners=False, antialias=True)
                 except TypeError:
-                    sample = self._interp(sample, size=(sh, sw), _default_mode="bicubic", _config_mode_key="latent_resample_mode_first")
-                    sample = self._interp(sample, size=(h, w), _default_mode="bicubic", _config_mode_key="latent_resample_mode_first")
+                    _s1 = self._interp(sample, size=(sh, sw), _default_mode="bicubic", _config_mode_key="latent_resample_mode_first")
+                    if _s1 is not None:
+                        sample = _s1
+                        _s2 = self._interp(sample, size=(h, w), _default_mode="bicubic", _config_mode_key="latent_resample_mode_first")
+                        if _s2 is not None:
+                            sample = _s2
     
         first_latent = float(self.config.get("first_latent", 0.3))
-        if 0.0 <= first_latent <= 1.0:
+        if x_latent is not None and 0.0 <= first_latent <= 1.0:
             invert = bool(self.config.get("first_latent_invert", False))  # NEW
             if invert:
                 # Новая семантика: слайдер = вес исходного латента, как на 2-м проходе