From 197b49d7d2aa46e12cc17c7b0c33ff59d69c0dd1 Mon Sep 17 00:00:00 2001 From: PolyMeilex Date: Sat, 16 Nov 2024 01:09:24 +0100 Subject: [PATCH] Update the default config behavior --- neothesia-core/src/config.rs | 4 ++-- .../src/scene/menu_scene/iced_menu/mod.rs | 20 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/neothesia-core/src/config.rs b/neothesia-core/src/config.rs index 53c7d2ad..f40aa33a 100644 --- a/neothesia-core/src/config.rs +++ b/neothesia-core/src/config.rs @@ -131,11 +131,11 @@ fn default_audio_gain() -> f32 { } fn default_vertical_guidelines() -> bool { - false + true } fn default_horizontal_guidelines() -> bool { - false + true } fn default_color_schema() -> Vec { diff --git a/neothesia/src/scene/menu_scene/iced_menu/mod.rs b/neothesia/src/scene/menu_scene/iced_menu/mod.rs index b1bb2463..79cc7cd8 100644 --- a/neothesia/src/scene/menu_scene/iced_menu/mod.rs +++ b/neothesia/src/scene/menu_scene/iced_menu/mod.rs @@ -182,15 +182,19 @@ impl Program for AppUi { self.data.inputs = ctx.input_manager.inputs(); if self.data.selected_output.is_none() { - if let Some(out) = self - .data - .outputs - .iter() - .find(|output| Some(output.to_string()) == ctx.config.output) - { - self.data.selected_output = Some(out.clone()); + if let Some(name) = ctx.config.output.as_ref() { + if let Some(out) = self + .data + .outputs + .iter() + .find(|output| output.to_string().as_str() == name) + { + self.data.selected_output = Some(out.clone()); + } else { + self.data.selected_output = self.data.outputs.first().cloned(); + } } else { - self.data.selected_output = self.data.outputs.first().cloned(); + self.data.selected_output = Some(OutputDescriptor::DummyOutput); } }