From 9a64723096e4efc2bd0ed2364bff069f2f186a2d Mon Sep 17 00:00:00 2001
From: icenine451 <benjamin.r.shelton@protonmail.com>
Date: Thu, 16 Mar 2023 11:45:20 -0400
Subject: [PATCH] - Found duplicate function, causing desktop-mode check to
 fail on first run after update - Removed unneeded "source" commands for
 rd_conf

---
 functions.sh   | 11 +----------
 post_update.sh |  1 -
 retrodeck.sh   |  2 --
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/functions.sh b/functions.sh
index 20367553..f8b46dd9 100644
--- a/functions.sh
+++ b/functions.sh
@@ -642,6 +642,7 @@ 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
 }
 
 resolve_preset_conflicts() {
@@ -1617,13 +1618,3 @@ configurator_destination_choice_dialog() {
 
   echo $choice
 }
-
-desktop_mode_warning() {
-  # This function is a generic warning for issues that happen when running in desktop mode.
-  # Running in desktop mode can be verified with the following command: if [[ $XDG_CURRENT_DESKTOP == "KDE" ]]; then
-
-  zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
-  --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
-  --title "RetroDECK Desktop Mode Warning" \
-  --text="You appear to be running RetroDECK in the Steam Deck's Desktop mode!\n\nSome functions of RetroDECK may not work properly in Desktop mode, such as the Steam Deck's normal controls.\n\nRetroDECK is best enjoyed in Game mode!"
-}
diff --git a/post_update.sh b/post_update.sh
index f4a178e3..310d93fa 100644
--- a/post_update.sh
+++ b/post_update.sh
@@ -67,6 +67,5 @@ 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
diff --git a/retrodeck.sh b/retrodeck.sh
index 75f09ba6..634c38b7 100644
--- a/retrodeck.sh
+++ b/retrodeck.sh
@@ -123,8 +123,6 @@ else
   fi
 fi
 
-source $rd_conf # Load latest variable values
-
 # Check if running in Desktop mode and warn if true, unless desktop_mode_warning=false in retrodeck.cfg
 
 desktop_mode_warning