Refactor

2 files changed, 8 insertions, 9 deletions

diff --git a/src/layout.rs b/src/layout.rs
index 20e564b..0cad56c 100644
--- a/src/layout.rs
+++ b/src/layout.rs
@@ -76,9 +76,9 @@ impl Layout {
         };
 
         // Prepare state fields.
-        let session = read_session(session_path);
         let (time_start, name_max) = make_layout(original_column);
-        let split = session.split.unwrap_or(Split::Vertical);
+        let session = read_session(session_path);
+        let split = session.split.unwrap_or_default();
         let has_bat = check_bat();
         let has_chafa = check_chafa();
         let is_kitty = check_kitty_support();
@@ -94,10 +94,9 @@ impl Layout {
             time_start_pos: time_start,
             sort_by: session.sort_by,
             show_hidden: session.show_hidden,
-            side: if session.preview.unwrap_or(false) {
-                Side::Preview
-            } else {
-                Side::None
+            side: match session.preview.unwrap_or(false) {
+                true => Side::Preview,
+                false => Side::None,
             },
             split,
             preview_start: (0, 0),
diff --git a/src/state.rs b/src/state.rs
index 78fbaf5..fa40bed 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -258,13 +258,13 @@ impl State {
 
     /// Set configuration from config file.
     pub fn set_config(&mut self, config: Config) {
-        let color = config.color.unwrap_or_default();
-        self.match_vim_exit_behavior = config.match_vim_exit_behavior.unwrap_or_default();
         self.default = config
             .default
             .unwrap_or_else(|| env::var("EDITOR").unwrap_or_default());
+        self.match_vim_exit_behavior = config.match_vim_exit_behavior.unwrap_or_default();
         self.commands = to_extension_map(&config.exec);
-        self.layout.colors = color;
+        let colors = config.color.unwrap_or_default();
+        self.layout.colors = colors;
     }
 
     /// Select item that the cursor points to.