From 4c02019d582e97663cade008ce4d97a23ec1126a Mon Sep 17 00:00:00 2001
From: Dowon <ks2515@naver.com>
Date: Wed, 28 Feb 2024 20:58:35 +0900
Subject: [PATCH] fix: controlnet_forge boolean -> controlnet_type

---
 controlnet_ext/__init__.py             | 6 +++---
 controlnet_ext/controlnet_ext.py       | 2 +-
 controlnet_ext/controlnet_ext_forge.py | 2 +-
 scripts/!adetailer.py                  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/controlnet_ext/__init__.py b/controlnet_ext/__init__.py
index 32efe17..06cc3a1 100644
--- a/controlnet_ext/__init__.py
+++ b/controlnet_ext/__init__.py
@@ -2,20 +2,20 @@ try:
     from .controlnet_ext_forge import (
         ControlNetExt,
         controlnet_exists,
-        controlnet_forge,
+        controlnet_type,
         get_cn_models,
     )
 except ImportError:
     from .controlnet_ext import (
         ControlNetExt,
         controlnet_exists,
-        controlnet_forge,
+        controlnet_type,
         get_cn_models,
     )
 
 __all__ = [
     "ControlNetExt",
     "controlnet_exists",
-    "controlnet_forge",
+    "controlnet_type",
     "get_cn_models",
 ]
diff --git a/controlnet_ext/controlnet_ext.py b/controlnet_ext/controlnet_ext.py
index 717d11b..134a7a4 100644
--- a/controlnet_ext/controlnet_ext.py
+++ b/controlnet_ext/controlnet_ext.py
@@ -23,7 +23,7 @@ except ImportError as e:
 ext_path = Path(extensions_dir)
 ext_builtin_path = Path(extensions_builtin_dir)
 controlnet_exists = False
-controlnet_forge = False
+controlnet_type = "standard"
 controlnet_path = None
 cn_base_path = ""
 
diff --git a/controlnet_ext/controlnet_ext_forge.py b/controlnet_ext/controlnet_ext_forge.py
index f829182..ef59e32 100644
--- a/controlnet_ext/controlnet_ext_forge.py
+++ b/controlnet_ext/controlnet_ext_forge.py
@@ -12,7 +12,7 @@ from modules.processing import StableDiffusionProcessing
 from .common import cn_model_regex
 
 controlnet_exists = True
-controlnet_forge = True
+controlnet_type = "forge"
 
 
 def find_script(p: StableDiffusionProcessing, script_title: str) -> scripts.Script:
diff --git a/scripts/!adetailer.py b/scripts/!adetailer.py
index 50ba314..7e4f436 100644
--- a/scripts/!adetailer.py
+++ b/scripts/!adetailer.py
@@ -39,7 +39,7 @@ from adetailer.ui import WebuiInfo, adui, ordinal, suffix
 from controlnet_ext import (
     ControlNetExt,
     controlnet_exists,
-    controlnet_forge,
+    controlnet_type,
     get_cn_models,
 )
 from controlnet_ext.restore import (
@@ -522,7 +522,7 @@ class AfterDetailerScript(scripts.Script):
         i2i._ad_disabled = True
         i2i._ad_inner = True
 
-        if args.ad_controlnet_model != "Passthrough" and not controlnet_forge:
+        if args.ad_controlnet_model != "Passthrough" and controlnet_type != "forge":
             self.disable_controlnet_units(i2i.script_args)
 
         if args.ad_controlnet_model not in ["None", "Passthrough"]: