ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10556 from cpba/detectflatpak 

Detect when running inside a flatpak sandbox
This commit is contained in:
OatmealDome 2024-08-16 12:48:28 -04:00 committed by GitHub
parent e91784e7ec 7bef0188af
commit 7c21bcd991
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/UICommon/UICommon.cpp
View File

@ -424,7 +424,7 @@ void SetUserDirectory(std::string custom_path)
// -> Use GetExeDirectory()/User // -> Use GetExeDirectory()/User
// 2. $DOLPHIN_EMU_USERPATH is set // 2. $DOLPHIN_EMU_USERPATH is set
// -> Use $DOLPHIN_EMU_USERPATH // -> Use $DOLPHIN_EMU_USERPATH
// 3. ~/.dolphin-emu directory exists // 3. ~/.dolphin-emu directory exists, and we're not in flatpak
// -> Use ~/.dolphin-emu // -> Use ~/.dolphin-emu
// 4. Default // 4. Default
// -> Use XDG basedir, see // -> Use XDG basedir, see
@ -457,7 +457,7 @@ void SetUserDirectory(std::string custom_path)
{ {
user_path = home_path + "." NORMAL_USER_DIR DIR_SEP; user_path = home_path + "." NORMAL_USER_DIR DIR_SEP;
if (!File::Exists(user_path)) if (File::Exists("/.flatpak-info") || !File::Exists(user_path))
{ {
const char* data_home = getenv("XDG_DATA_HOME"); const char* data_home = getenv("XDG_DATA_HOME");
std::string data_path = std::string data_path =