aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAUTOMATIC1111 <16777216c@gmail.com>2023-08-28 07:53:37 +0300
committerGitHub <noreply@github.com>2023-08-28 07:53:37 +0300
commit8632452627e1341bcd447dbec3c1516f319200a0 (patch)
tree342576f3a42cb1ef4affc075278a3b91c893408d
parent66146ed72bd032ec3123c43623d7d5be6efba7fc (diff)
parent18e3e6d6abfc084324cc8ae13f70ba4af5ddc35f (diff)
Merge pull request #12815 from AUTOMATIC1111/consolidate-local-check
consolidate local check
-rw-r--r--modules/shared_cmd_options.py4
-rw-r--r--webui.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/shared_cmd_options.py b/modules/shared_cmd_options.py
index dd93f520..c9626667 100644
--- a/modules/shared_cmd_options.py
+++ b/modules/shared_cmd_options.py
@@ -14,5 +14,5 @@ if os.environ.get('IGNORE_CMD_ARGS_ERRORS', None) is None:
else:
cmd_opts, _ = parser.parse_known_args()
-
-cmd_opts.disable_extension_access = any([cmd_opts.share, cmd_opts.listen, cmd_opts.ngrok, cmd_opts.server_name]) and not cmd_opts.enable_insecure_extension_access
+cmd_opts.webui_is_non_local = any([cmd_opts.share, cmd_opts.listen, cmd_opts.ngrok, cmd_opts.server_name])
+cmd_opts.disable_extension_access = cmd_opts.webui_is_non_local and not cmd_opts.enable_insecure_extension_access
diff --git a/webui.py b/webui.py
index 12328423..9ed20b30 100644
--- a/webui.py
+++ b/webui.py
@@ -74,7 +74,7 @@ def webui():
if shared.opts.auto_launch_browser == "Remote" or cmd_opts.autolaunch:
auto_launch_browser = True
elif shared.opts.auto_launch_browser == "Local":
- auto_launch_browser = not any([cmd_opts.listen, cmd_opts.share, cmd_opts.ngrok, cmd_opts.server_name])
+ auto_launch_browser = not cmd_opts.webui_is_non_local
app, local_url, share_url = shared.demo.launch(
share=cmd_opts.share,