From ac1abf3de68614d575de79347a2aa4a33ee4d6bb Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 26 Aug 2023 06:33:48 +0300
Subject: fix defaults settings page breaking when any of main UI tabs are
 hidden

---
 modules/ui.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/ui.py b/modules/ui.py
index 2b6a13cb..579bab98 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -1279,11 +1279,8 @@ def create_ui():
                 with gr.TabItem(label, id=ifid, elem_id=f"tab_{ifid}"):
                     interface.render()
 
-            for interface, _label, ifid in interfaces:
-                if ifid in ["extensions", "settings"]:
-                    continue
-
-                loadsave.add_block(interface, ifid)
+                if ifid not in ["extensions", "settings"]:
+                    loadsave.add_block(interface, ifid)
 
             loadsave.add_component(f"webui/Tabs@{tabs.elem_id}", tabs)
 
-- 
cgit v1.2.3


From 168eac319d0f45c778d5b9d35dd5ce280f8d5094 Mon Sep 17 00:00:00 2001
From: Daniel Dengler <daniel@busitec.de>
Date: Sat, 26 Aug 2023 23:22:57 +0200
Subject: is_automatic is missing () for call

---
 modules/sd_vae.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/sd_vae.py b/modules/sd_vae.py
index 669097da..31306d8b 100644
--- a/modules/sd_vae.py
+++ b/modules/sd_vae.py
@@ -159,7 +159,7 @@ def resolve_vae_from_user_metadata(checkpoint_file) -> VaeResolution:
 
 def resolve_vae_near_checkpoint(checkpoint_file) -> VaeResolution:
     vae_near_checkpoint = find_vae_near_checkpoint(checkpoint_file)
-    if vae_near_checkpoint is not None and (not shared.opts.sd_vae_overrides_per_model_preferences or is_automatic):
+    if vae_near_checkpoint is not None and (not shared.opts.sd_vae_overrides_per_model_preferences or is_automatic()):
         return VaeResolution(vae_near_checkpoint, 'found near the checkpoint')
 
     return VaeResolution(resolved=False)
-- 
cgit v1.2.3