From 8c4e7d484cca035a3275ff5847cf168c114b0251 Mon Sep 17 00:00:00 2001 From: Trisha Date: Fri, 25 Mar 2022 15:24:45 -0500 Subject: [PATCH] :recycle: refactor: load server GUI config before creating the GUI --- crates/ptth_server_gui/src/main.rs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/crates/ptth_server_gui/src/main.rs b/crates/ptth_server_gui/src/main.rs index 12408bd..f9f7e10 100644 --- a/crates/ptth_server_gui/src/main.rs +++ b/crates/ptth_server_gui/src/main.rs @@ -42,7 +42,9 @@ fn main () let app = app::App::default(); let mut wind = Window::new (100, 100, 500, 180, "PTTH server"); - let mut gui = Gui::new (fltk_tx); + let config_file_opt = ptth_server::load_toml::load:: ("./config/ptth_server.toml").ok (); + + let mut gui = Gui::new (fltk_tx, config_file_opt.as_ref ()); gui.set_server_running (false); wind.end (); @@ -111,7 +113,12 @@ pub struct ConfigFile { } impl Gui { - fn new (fltk_tx: app::Sender ) -> Self { + fn new ( + fltk_tx: app::Sender , + config_file_opt: Option <&ConfigFile>, + ) + -> Self + { let mut input_name = Input::new (200, 10, 290, 20, "name"); input_name.set_value ("my_ptth_server"); @@ -134,7 +141,7 @@ impl Gui { but_stop.set_trigger (CallbackTrigger::Changed); but_stop.emit (fltk_tx, Message::StopServer); - if let Ok (config_file) = ptth_server::load_toml::load:: ("./config/ptth_server.toml") + if let Some (config_file) = config_file_opt { if let Some (v) = config_file.name.as_ref () { input_name.set_value (v);