aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpapuSpartan <mcgpapu@gmail.com>2022-11-14 14:07:13 -0600
committerpapuSpartan <mcgpapu@gmail.com>2022-11-14 14:07:13 -0600
commit3405acc6a4dcef2b73782a04924a9a12422e54f0 (patch)
tree28ebc7e594a100cffc4eb90bc8a29ff4532e1a9b
parent98947d173e3f1667eba29c904f681047dea9de90 (diff)
Give --server-name priority over --listen and add check for --server-name in addition to --share and --listen
-rw-r--r--modules/shared.py2
-rw-r--r--webui.py5
2 files changed, 5 insertions, 2 deletions
diff --git a/modules/shared.py b/modules/shared.py
index 6936cbe0..c628b580 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -106,7 +106,7 @@ restricted_opts = {
"outdir_save",
}
-cmd_opts.disable_extension_access = (cmd_opts.share or cmd_opts.listen) and not cmd_opts.enable_insecure_extension_access
+cmd_opts.disable_extension_access = (cmd_opts.share or cmd_opts.listen or cmd_opts.server_name) and not cmd_opts.enable_insecure_extension_access
devices.device, devices.device_interrogate, devices.device_gfpgan, devices.device_swinir, devices.device_esrgan, devices.device_scunet, devices.device_codeformer = \
(devices.cpu if any(y in cmd_opts.use_cpu for y in [x, 'all']) else devices.get_optimal_device() for x in ['sd', 'interrogate', 'gfpgan', 'swinir', 'esrgan', 'scunet', 'codeformer'])
diff --git a/webui.py b/webui.py
index f4f1d74d..fc776669 100644
--- a/webui.py
+++ b/webui.py
@@ -33,7 +33,10 @@ from modules.shared import cmd_opts
import modules.hypernetworks.hypernetwork
queue_lock = threading.Lock()
-server_name = "0.0.0.0" if cmd_opts.listen else cmd_opts.server_name
+if cmd_opts.server_name:
+ server_name = cmd_opts.server_name
+else:
+ server_name = "0.0.0.0" if cmd_opts.listen else None
def wrap_queued_call(func):
def f(*args, **kwargs):