From 2e5ae9e999b334e529413d6c77b583026544aff9 Mon Sep 17 00:00:00 2001
From: SpikeHD <25207995+SpikeHD@users.noreply.github.com>
Date: Sun, 10 Nov 2024 18:02:47 -0800
Subject: [PATCH] fix: swap merge order

---
 src-tauri/src/config.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-tauri/src/config.rs b/src-tauri/src/config.rs
index 928e3a7f..b09b42e9 100644
--- a/src-tauri/src/config.rs
+++ b/src-tauri/src/config.rs
@@ -146,7 +146,7 @@ impl Config {
 
     match serde_json::from_str::<Config>(config_str) {
       Ok(config) => {
-        let config = config.merge(Self::default());
+        let config = Self::default().merge(config);
         Ok(config)
       },
       Err(e) => {
@@ -174,7 +174,7 @@ impl Config {
   pub fn from_str(contents: impl AsRef<str>) -> Result<Self, Box<dyn std::error::Error>> {
     match serde_json::from_str::<Config>(contents.as_ref()) {
       Ok(config) => {
-        let config = config.merge(Self::default());
+        let config = Self::default().merge(config);
         Ok(config)
       },
       Err(e) => {