From e55bb2f9b9f111ebfe6a5277be62056f277633f9 Mon Sep 17 00:00:00 2001
From: icenine451 <59938822+icenine451@users.noreply.github.com>
Date: Wed, 15 Mar 2023 19:58:02 -0400
Subject: [PATCH] New rd_cpnf variables not loaded correctly after update

---
 functions.sh   | 1 -
 post_update.sh | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/functions.sh b/functions.sh
index b17d2716..552044ef 100644
--- a/functions.sh
+++ b/functions.sh
@@ -629,7 +629,6 @@ update_rd_conf() {
   deploy_single_patch $rd_defaults $rd_update_patch $rd_conf
   set_setting_value $rd_conf "version" "$hard_version" retrodeck # Set version of currently running RetroDECK to updated retrodeck.cfg
   rm -f $rd_update_patch # Cleanup temporary patch file
-  source $rd_conf # Load new config file variables
 }
 
 conf_write() {
diff --git a/post_update.sh b/post_update.sh
index cc469cec..6626019a 100644
--- a/post_update.sh
+++ b/post_update.sh
@@ -187,7 +187,7 @@ post_update() {
     # - Primehack preconfiguration completely redone. "Stop emulation" hotkey set to Start+Select, Xbox and Nintendo keymap profiles were created, Xbox set as default.
     # - Duckstation save and state locations were dir_prep'd to the rdhome/save and /state folders, which was not previously done. Much safer now!
     # - Fix PICO-8 folder structure. ROM and save folders are now sane and binary files will go into ~/retrodeck/bios/pico-8/
-    
+
     rm -rf /var/config/primehack # Purge old Primehack config files. Saves are safe as they are linked into /var/data/primehack.
     primehack_init
 
@@ -209,6 +209,6 @@ post_update() {
   --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
   --title "RetroDECK Finishing Upgrade" \
   --text="RetroDECK is finishing the upgrade process, please wait."
-
+  source $rd_conf # Load new config file variables
   create_lock
 }
\ No newline at end of file