mirror of
https://github.com/RetroDECK/RetroDECK.git
synced 2025-01-18 06:45:38 +00:00
- Found duplicate function, causing desktop-mode
check to fail on first run after update - Removed unneeded "source" commands for rd_conf
This commit is contained in:
parent
377ec61d23
commit
9a64723096
11
functions.sh
11
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!"
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue