Merge pull request #14767 from AUTOMATIC1111/minor-fix-to-#14525

minor fix to #14525
AUTOMATIC1111 · Jan 26, 2024 · 4d5db58 · 4d5db58
2 parents c6c9d12 + 47cf920
commit 4d5db58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -198,6 +198,8 @@ def load(self, filename):
  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"))