diff --git a/scenes/настройки/настройки.tscn b/scenes/настройки/настройки.tscn index 7384e82c..e7573903 100644 --- a/scenes/настройки/настройки.tscn +++ b/scenes/настройки/настройки.tscn @@ -175,7 +175,7 @@ func setting_tab(): var child = node_values[0] if child is CheckButton: child.connect('pressed', Callable(self, 'on_checkbutton_pressed').bind(i)) - var val = settings_data[param_name] if settings_data.has(param_name) else false + var val = ProjectSettings.get_setting('application/config/%s' % param_name) child.set_pressed(val) else: if settings_data.has(param_name): @@ -216,7 +216,6 @@ func button_settings(): var trassa_node = $scroll_set/table.get_node2(1, TRASSA).get_children() trassa_node = trassa_node[0] trassa_node.connect('pressed', on_trassa_btn_pressed.bind(trassa_node)) - on_trassa_btn_pressed(trassa_node) var vk_node = $scroll_set/table.get_node2(1, KEYBOARD).get_children()[0] vk_node.connect('pressed', on_vk_pressed.bind(vk_node)) var ems2_hide_node = $scroll_set/table.get_node2(1, HIDE_EMS2).get_children()[0] diff --git a/scripts/settings.gd b/scripts/settings.gd index 0628fcd8..fe308b99 100644 --- a/scripts/settings.gd +++ b/scripts/settings.gd @@ -79,7 +79,7 @@ func _ready() -> void: log.warning('Будут использованы настройики по умолчанию.') return var json_data = json_conv.get_data() - settings_program.merge(json_data) + settings_program.merge(json_data, true) for key in settings_program: ProjectSettings.set_setting('application/config/%s' % key, settings_program[key]) for key: StringName in UnitProfiles.keys():