diff options
author | AUTOMATIC1111 <16777216c@gmail.com> | 2024-01-26 16:04:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-26 16:04:13 +0000 |
commit | 4d5db58a3e82b441fa0ca15df0370d49175e2aea (patch) | |
tree | b96f19ce834ccf8b2802fe0c1772e37dfb85670b | |
parent | c6c9d1227578525385a9e805b4099a07b3440062 (diff) | |
parent | 47cf92039b524bb6dad05e96607208b8b9df7ede (diff) | |
download | stable-diffusion-webui-gfx803-4d5db58a3e82b441fa0ca15df0370d49175e2aea.tar.gz stable-diffusion-webui-gfx803-4d5db58a3e82b441fa0ca15df0370d49175e2aea.tar.bz2 stable-diffusion-webui-gfx803-4d5db58a3e82b441fa0ca15df0370d49175e2aea.zip |
Merge pull request #14767 from AUTOMATIC1111/minor-fix-to-#14525
minor fix to #14525
-rw-r--r-- | modules/launch_utils.py | 1 | ||||
-rw-r--r-- | modules/options.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/launch_utils.py b/modules/launch_utils.py index 8e58d714..3ff4576a 100644 --- a/modules/launch_utils.py +++ b/modules/launch_utils.py @@ -251,7 +251,6 @@ def list_extensions(settings_file): except Exception:
errors.report(f'\nCould not load settings\nThe config file "{settings_file}" is likely corrupted\nIt has been moved to the "tmp/config.json"\nReverting config to default\n\n''', exc_info=True)
os.replace(settings_file, os.path.join(script_path, "tmp", "config.json"))
- settings = {}
disabled_extensions = set(settings.get('disabled_extensions', []))
disable_all_extensions = settings.get('disable_all_extensions', 'none')
diff --git a/modules/options.py b/modules/options.py index 503b40e9..35ccade2 100644 --- a/modules/options.py +++ b/modules/options.py @@ -198,6 +198,8 @@ class Options: try:
with open(filename, "r", encoding="utf8") as file:
self.data = json.load(file)
+ except FileNotFoundError:
+ self.data = {}
except Exception:
errors.report(f'\nCould not load settings\nThe config file "{filename}" is likely corrupted\nIt has been moved to the "tmp/config.json"\nReverting config to default\n\n''', exc_info=True)
os.replace(filename, os.path.join(script_path, "tmp", "config.json"))
|