From f2d3b349d8487cf0ee50b36ba024ac513d36f826 Mon Sep 17 00:00:00 2001 From: Carles Pastor Date: Sat, 20 Aug 2022 13:35:32 +0200 Subject: [PATCH] Detect we are running inside a flatpak sandbox --- Source/Core/UICommon/UICommon.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/UICommon/UICommon.cpp b/Source/Core/UICommon/UICommon.cpp index 8d9dc2abb8..8a9d39a3d5 100644 --- a/Source/Core/UICommon/UICommon.cpp +++ b/Source/Core/UICommon/UICommon.cpp @@ -348,7 +348,7 @@ void SetUserDirectory(std::string custom_path) // -> Use GetExeDirectory()/User // 2. $DOLPHIN_EMU_USERPATH is set // -> Use $DOLPHIN_EMU_USERPATH - // 3. ~/.dolphin-emu directory exists + // 3. ~/.dolphin-emu directory exists, and we're not in flatpak // -> Use ~/.dolphin-emu // 4. Default // -> Use XDG basedir, see @@ -381,7 +381,7 @@ void SetUserDirectory(std::string custom_path) { user_path = home_path + "." DOLPHIN_DATA_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"); std::string data_path = -- 2.37.1