From 79eef747b3bcb9b2dc1595bc5bda4fb418f96a73 Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Mon, 29 Jan 2024 10:59:16 -0500
Subject: [PATCH] unblock controlnet

---
 extensions-builtin/sd-webui-controlnet | 2 +-
 installer.py                           | 4 +---
 modules/shared.py                      | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/extensions-builtin/sd-webui-controlnet b/extensions-builtin/sd-webui-controlnet
index ecd33eb82..c5432dd4f 160000
--- a/extensions-builtin/sd-webui-controlnet
+++ b/extensions-builtin/sd-webui-controlnet
@@ -1 +1 @@
-Subproject commit ecd33eb82b25c77cec3185cc9647db904fcb7c03
+Subproject commit c5432dd4f605ff5ddc63a6b477d8df68654ea65c
diff --git a/installer.py b/installer.py
index 1f023efa5..14a16847d 100644
--- a/installer.py
+++ b/installer.py
@@ -47,7 +47,7 @@ args = Dot({
 })
 git_commit = "unknown"
 submodules_commit = {
-    'sd-webui-controlnet': 'ecd33eb',
+    # 'sd-webui-controlnet': 'ecd33eb',
     # 'stable-diffusion-webui-images-browser': '27fe4a7',
 }
 
@@ -285,13 +285,11 @@ def update(folder, current_branch = False, rebase = True):
         pass
     arg = '--rebase --force' if rebase else ''
     if current_branch:
-        print('HERE1')
         res = git(f'pull {arg}', folder)
         debug(f'Install update: folder={folder} args={arg} {res}')
         return res
     b = branch(folder)
     if branch is None:
-        print('HERE2')
         res = git(f'pull {arg}', folder)
         debug(f'Install update: folder={folder} branch={b} args={arg} {res}')
     else:
diff --git a/modules/shared.py b/modules/shared.py
index c5d777b59..9d4aa406a 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -440,8 +440,8 @@ options_templates.update(options_section(('system-paths', "System Paths"), {
     "models_paths_sep_options": OptionInfo("<h2>Models paths</h2>", "", gr.HTML),
     "models_dir": OptionInfo('models', "Base path where all models are stored", folder=True),
     "ckpt_dir": OptionInfo(os.path.join(paths.models_path, 'Stable-diffusion'), "Folder with stable diffusion models", folder=True),
-    "diffusers_dir": OptionInfo(os.path.join(paths.models_path, 'Diffusers'), "Folder with Hugggingface models", folder=True),
-    "hfcache_dir": OptionInfo(os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'hub'), "Folder for Hugggingface cache", folder=True),
+    "diffusers_dir": OptionInfo(os.path.join(paths.models_path, 'Diffusers'), "Folder with Huggingface models", folder=True),
+    "hfcache_dir": OptionInfo(os.path.join(os.path.expanduser('~'), '.cache', 'huggingface', 'hub'), "Folder for Huggingface cache", folder=True),
     "vae_dir": OptionInfo(os.path.join(paths.models_path, 'VAE'), "Folder with VAE files", folder=True),
     "sd_lora": OptionInfo("", "Add LoRA to prompt", gr.Textbox, {"visible": False}),
     "lora_dir": OptionInfo(os.path.join(paths.models_path, 'Lora'), "Folder with LoRA network(s)", folder=True),