From c44d69dcde20d6b200f7c2782a4ebbb848e2ed1f Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 18 May 2020 21:27:30 +0200 Subject: Move app startup code to server part Signed-off-by: Matthias Beyer --- src/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index 6575203..b624bd8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -93,18 +93,18 @@ async fn main() -> Result<()> { let start_server = crate::server::do_start(&cli); match (server_running, start_server) { - (true, false) => crate::gui::run_gui(config, adr), + (true, false) => crate::gui::run_gui(adr), (false, false) => { // fork() info!("Spawning server thread..."); let path = std::env::current_exe()?; let mut child = std::process::Command::new(path).arg("server").spawn()?; - let r = crate::gui::run_gui(config, adr); + let r = crate::gui::run_gui(adr); child.kill()?; r }, - (false, true) => crate::server::run_server(server_lock, adr).await, + (false, true) => crate::server::run_server(config, server_lock, adr).await, (true, true) => { info!("Server is already running. Doing nothing."); -- cgit v1.2.3