diff --git a/configs/org.citra_emu.citra/config/citra-emu/qt-config.ini b/configs/org.citra_emu.citra/config/citra-emu/qt-config.ini index 623a6ee3..c86e3893 100644 --- a/configs/org.citra_emu.citra/config/citra-emu/qt-config.ini +++ b/configs/org.citra_emu.citra/config/citra-emu/qt-config.ini @@ -398,7 +398,7 @@ Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq=Ctrl+A Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context\default=true Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context=2 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq\default=false -Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=E +Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=F10 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context\default=true Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context=1 Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=true diff --git a/functions/ToolScripts/emuDeckESDE.sh b/functions/ToolScripts/emuDeckESDE.sh index 03f98976..015065ef 100644 --- a/functions/ToolScripts/emuDeckESDE.sh +++ b/functions/ToolScripts/emuDeckESDE.sh @@ -31,9 +31,10 @@ ESDE_cleanup(){ # 2.2 migration ESDE_migration(){ - if [ -f "${toolsPath}/EmulationStation-DE-x64_SteamDeck.AppImage" ]; then + if [ -f "${toolsPath}/EmulationStation-DE-x64_SteamDeck.AppImage" ] && [ ! -L "${toolsPath}/EmulationStation-DE-x64_SteamDeck.AppImage" ]; then mv "${toolsPath}/EmulationStation-DE-x64_SteamDeck.AppImage" "${toolsPath}/EmulationStation-DE.AppImage" sed -i "s|EmulationStation-DE-x64_SteamDeck.AppImage|EmulationStation-DE.AppImage|g" "$toolsPath/launchers/esde/emulationstationde.sh" + ln -s "${toolsPath}/EmulationStation-DE.AppImage" "${toolsPath}/EmulationStation-DE-x64_SteamDeck.AppImage" ESDE_createDesktopShortcut fi } diff --git a/functions/ToolScripts/emuDeckSRM.sh b/functions/ToolScripts/emuDeckSRM.sh index 321e0b29..54fe3cd9 100644 --- a/functions/ToolScripts/emuDeckSRM.sh +++ b/functions/ToolScripts/emuDeckSRM.sh @@ -37,6 +37,10 @@ SRM_migration(){ if [ -d "${toolsPath}/srm" ]; then cp "${toolsPath}"/srm/*.AppImage "${toolsPath}" && rm -rf "${toolsPath}/srm" SRM_createDesktopShortcut + + SRM_createParsers + SRM_addSteamInputProfiles + Citra_resetConfig PCSX2QT_resetConfig DuckStation_resetConfig diff --git a/functions/appImageInit.sh b/functions/appImageInit.sh index 577f27a7..2d555604 100644 --- a/functions/appImageInit.sh +++ b/functions/appImageInit.sh @@ -20,9 +20,11 @@ appImageInit() { ESDE_migration # 2.2 Changes autofix_dynamicParsers # 2.2 Changes + #Force SRM appimage move in case the migration fails mv "${toolsPath}/srm/Steam-ROM-Manager.AppImage" "${toolsPath}/Steam ROM Manager.AppImage" &>> /dev/null + #Xenia temp fix if [ "$(Xenia_IsInstalled)" == "true" ]; then setSetting doInstallXenia "true" fi diff --git a/functions/autofix.sh b/functions/autofix.sh index 4511c841..bb93ab67 100644 --- a/functions/autofix.sh +++ b/functions/autofix.sh @@ -21,8 +21,6 @@ autofix_duplicateESDE(){ function autofix_dynamicParsers(){ if ! [ -n "$emuMULTI" ]; then - zenityInfo "SRM Parsers issue detected" "We've detected issues with the Dynamic Parsers, if you were missing some parsers this action will fix it. If you are still facing SRM issues do a Custom Reset" - setSetting emuMULTI "ra" setSetting emuGBA "multiemulator" setSetting emuMAME "multiemulator"