From 147336ba6121264174104aa1b1d016ba64188838 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 8 Jun 2023 13:49:14 -0400 Subject: [PATCH] Move all-emulator reset outside of controller profile install because it was running resets twice during finit --- functions/functions.sh | 3 +-- functions/post_update.sh | 1 + rd-submodules/retroarch | 2 +- rd-submodules/shared-modules | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/functions/functions.sh b/functions/functions.sh index 5b39e43f..2a7b1928 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -461,12 +461,11 @@ install_retrodeck_starterpack() { install_retrodeck_controller_profile() { # This function will install the needed files for the custom RetroDECK controller profile # NOTE: These files need to be stored in shared locations for Steam, outside of the normal RetroDECK folders and should always be an optional user choice - # BIGGER NOTE: As part of this process, all emulators have their configs hard-reset to match the controller mappings of the profile + # BIGGER NOTE: As part of this process, all emulators will need to have their configs hard-reset to match the controller mappings of the profile # USAGE: install_retrodeck_controller_profile if [[ -d "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" && -d "$HOME/.steam/steam/controller_base/templates/" ]]; then rsync -a "/app/retrodeck/binding-icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" - prepare_emulator "reset" "all" else configurator_generic_dialog "RetroDECK Controller Profile Install" "The target directories for the controller profile do not exist.\n\nThis may happen if you do not have Steam installed or the location is does not have permission to be read." fi diff --git a/functions/post_update.sh b/functions/post_update.sh index 7ea81bb5..25833ef2 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -216,6 +216,7 @@ post_update() { configurator_generic_dialog "RetroDECK 0.7.0b Upgrade" "As part of this update, we are offering a new official RetroDECK controller profile!\nIt is an optional component that helps you get the most out of RetroDECK with a new in-game radial menu for unified hotkeys across emulators.\n\nThe files need to be installed outside of the normal ~/retrodeck folder AND REQUIRES A FULL RESET OF ALL EMULATORS, so we wanted your permission before proceeding.\nIf you decide to not install the profile now, it can always be done later through the Configurator.\n\nAny custom changes you have made to the emulator configurations will be reset if you choose to proceed!" if [[ $(configurator_generic_question_dialog "RetroDECK Official Controller Profile" "Would you like to install the official RetroDECK controller profile?") == "true" ]]; then install_retrodeck_controller_profile + prepare_emulator "reset" "all" fi fi diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch index fbfdda61..0b1cfb79 160000 --- a/rd-submodules/retroarch +++ b/rd-submodules/retroarch @@ -1 +1 @@ -Subproject commit fbfdda61b3da092a71cc53999dd3e7b909f244e2 +Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules index 50314360..a2441b96 160000 --- a/rd-submodules/shared-modules +++ b/rd-submodules/shared-modules @@ -1 +1 @@ -Subproject commit 50314360ded6fa3b9f0b602513b1164b7a6636ed +Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42