From 789005d66a8def0c4ae2af1da85a4719958ebb19 Mon Sep 17 00:00:00 2001
From: Thomas Linford <tlinford@users.noreply.github.com>
Date: Sun, 12 Sep 2021 23:12:25 +0200
Subject: fix automated build errors on setup command (#711)

- handle opts before client os input setup
---
 src/main.rs | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/main.rs b/src/main.rs
index f0d00f77a..abf40aa83 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -36,6 +36,14 @@ pub fn main() {
         };
         start_server(Box::new(os_input), path);
     } else {
+        let (config, layout, config_options) = match Setup::from_options(&opts) {
+            Ok(results) => results,
+            Err(e) => {
+                eprintln!("{}", e);
+                process::exit(1);
+            }
+        };
+
         let os_input = match get_client_os_input() {
             Ok(os_input) => os_input,
             Err(e) => {
@@ -54,14 +62,6 @@ pub fn main() {
                 session_name = Some(get_active_session());
             }
 
-            let (config, _, config_options) = match Setup::from_options(&opts) {
-                Ok(results) => results,
-                Err(e) => {
-                    eprintln!("{}", e);
-                    process::exit(1);
-                }
-            };
-
             start_client(
                 Box::new(os_input),
                 opts,
@@ -70,14 +70,6 @@ pub fn main() {
                 None,
             );
         } else {
-            let (config, layout, _) = match Setup::from_options(&opts) {
-                Ok(results) => results,
-                Err(e) => {
-                    eprintln!("{}", e);
-                    process::exit(1);
-                }
-            };
-
             let session_name = opts
                 .session
                 .clone()
-- 
cgit v1.2.3