Merge branch 'jpg_config_image_extension'

# Conflicts:
#	modules/config.py
#	modules/flags.py
#	webui.py
This commit is contained in:
Manuel Schmid
2024-01-14 23:40:24 +01:00
4 changed files with 13 additions and 13 deletions
+3 -3
View File
@@ -289,10 +289,10 @@ default_max_image_number = get_config_item_or_set_default(
default_value=32,
validator=lambda x: isinstance(x, int) and x >= 1
)
default_image_extension = get_config_item_or_set_default(
key='default_image_extension',
default_image_file_extension = get_config_item_or_set_default(
key='default_image_file_extension',
default_value='png',
validator=lambda x: x in modules.flags.image_extensions
validator=lambda x: x in modules.flags.image_file_extensions
)
default_image_number = get_config_item_or_set_default(
key='default_image_number',