Emulation/EmuDeck
1
0
Fork 0
mirror of https://github.com/dragoonDorise/EmuDeck.git synced 2024-05-20 05:10:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Citra: Hotfix freezing (#1180)

Browse source 
* Flatpak and AppImage configs were tangled. Added sed commands to redirect AppImage to AppImage paths.
This commit is contained in:
rawdatafeel 2024-04-06 13:13:00 -04:00 committed by GitHub
parent 36f2807df3
commit 07b13baa52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configs/org.citra_emu.citra/config/citra-emu/qt-config.ini
View file

@ -175,9 +175,9 @@ use_cpu_jit\default=true
[Data%20Storage]
nand_directory=/home/deck/.var/app/org.citra_emu.citra/data/citra-emu/nand/
nand_directory\default=false
nand_directory\default=true
sdmc_directory=/home/deck/.var/app/org.citra_emu.citra/data/citra-emu/sdmc/
sdmc_directory\default=false
sdmc_directory\default=true
use_custom_storage=false
use_custom_storage\default=true
use_virtual_sd=true
@ -457,7 +457,7 @@ Paths\language=en
Paths\language\default=false
Paths\moviePlaybackPath=
Paths\movieRecordPath=
Paths\recentFiles=/home/deck/Emulation/roms/n3ds/Picross 3D - Round 2.3ds,
Paths\recentFiles=
Paths\romsPath=
Paths\screenshotPath=/home/deck/.var/app/org.citra_emu.citra/data/citra-emu/screenshots/
Paths\screenshotPath\default=false

25
functions/EmuScripts/emuDeckCitra.sh
View file

@ -74,6 +74,18 @@ Citra_setEmulationFolder(){
newGameDirOpt='Paths\\gamedirs\\3\\path='"${romsPath}/n3ds"
sed -i "/${gameDirOpt}/c\\${newGameDirOpt}" "$Citra_configFile"
nandDirOpt='nand_directory='
newnandDirOpt='nand_directory='"$HOME/.local/share/citra-emu/nand/"
sed -i "/${nandDirOpt}/c\\${newnandDirOpt}" "$Citra_configFile"
sdmcDirOpt='sdmc_directory='
newsdmcDirOpt='sdmc_directory='"$HOME/.local/share/citra-emu/sdmc/"
sed -i "/${sdmcDirOpt}/c\\${newsdmcDirOpt}" "$Citra_configFile"
screenshotsDirOpt='Paths\\screenshotPath='
newscreenshotDirOpt='Paths\\screenshotPath='"$HOME/.local/share/citra-emu/screenshots/"
sed -i "/${screenshotsDirOpt}/c\\${newscreenshotDirOpt}" "$Citra_configFile"
#Setup symlink for AES keys
mkdir -p "${biosPath}/citra/"
mkdir -p "$HOME/.local/share/citra-emu/sysdata"
@ -88,12 +100,6 @@ Citra_setEmulationFolder(){
echo "Flatpak found. Setting configurations."
if [[ -e "$Citra_emuPath" ]] && [[ ! -f "$HOME/.config/EmuDeck/.citrasaves" ]]; then
echo "AppImage found. Copying Flatpak saves."
mkdir -p "$HOME/.local/share/citra-emu/sdmc"
rsync -avhp "$HOME/.var/app/org.citra_emu.citra/data/citra-emu/sdmc/." "$HOME/.local/share/citra-emu/sdmc/." --ignore-existing
touch "$HOME/.config/EmuDeck/.citrasaves"
fi
mkdir -p $Citra_flatpakconfigPath
rsync -avhp "$EMUDECKGIT/configs/org.citra_emu.citra/config/citra-emu/qt-config.ini" "$Citra_flatpakconfigPath/qt-config.ini" --backup --suffix=.bak
@ -110,6 +116,13 @@ Citra_setEmulationFolder(){
echo "Flatpak not found."
fi
if [[ -e "$Citra_emuPath" ]] && [[ ! -f "$HOME/.config/EmuDeck/.citracopysaves" ]] && [[ -d "$HOME/.var/app/org.citra_emu.citra/data/citra-emu/sdmc" ]] ; then
echo "AppImage found. Copying Flatpak saves."
mkdir -p "$HOME/.local/share/citra-emu/sdmc"
rsync -avhp "$HOME/.var/app/org.citra_emu.citra/data/citra-emu/sdmc/." "$HOME/.local/share/citra-emu/sdmc/." --ignore-existing
touch "$HOME/.config/EmuDeck/.citracopysaves"
fi
}