From bcd10a386366c4d7a07b901615dcadb97c5d11ba Mon Sep 17 00:00:00 2001
From: sirmangler <sirmangler1@gmail.com>
Date: Sat, 24 Sep 2022 16:28:59 +0100
Subject: [PATCH] Fix flatpak patch

---
 detectflatpak.patch | 48 ++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/detectflatpak.patch b/detectflatpak.patch
index 2133f1f..60dd1a2 100644
--- a/detectflatpak.patch
+++ b/detectflatpak.patch
@@ -1,40 +1,34 @@
-commit d4c899cede0743d40934ca11f83691cda72ff9dd
-Author: Carles Pastor <cpbadosa@gmail.com>
-Date:   Sat Apr 2 20:47:06 2022 +0200
+From f2d3b349d8487cf0ee50b36ba024ac513d36f826 Mon Sep 17 00:00:00 2001
+From: Carles Pastor <cpbadosa@gmail.com>
+Date: Sat, 20 Aug 2022 13:35:32 +0200
+Subject: [PATCH] Detect we are running inside a flatpak sandbox
 
-    Detect when 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 cb857fd3c7..e3ddde24fb 100644
+index 8d9dc2abb8..8a9d39a3d5 100644
 --- a/Source/Core/UICommon/UICommon.cpp
 +++ b/Source/Core/UICommon/UICommon.cpp
-@@ -309,24 +309,25 @@ void SetUserDirectory(std::string custom_path)
-     // We are on a non-Apple and non-Android POSIX system, there are 4 cases:
-     // 1. GetExeDirectory()/portable.txt exists
+@@ -348,7 +348,7 @@ void SetUserDirectory(std::string custom_path)
      //    -> Use GetExeDirectory()/User
--    // 2. $DOLPHIN_EMU_USERPATH is set
-+    // 2. $DOLPHIN_EMU_USERPATH is set, and we're not in flatpak
+     // 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
-     //    http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-     user_path = home_path + "." DOLPHIN_DATA_DIR DIR_SEP;
-     std::string exe_path = File::GetExeDirectory();
-+    bool flatpak = File::Exists("/.flatpak-info");
-     if (File::Exists(exe_path + DIR_SEP "portable.txt"))
+@@ -381,7 +381,7 @@ void SetUserDirectory(std::string custom_path)
      {
-       user_path = exe_path + DIR_SEP "User" DIR_SEP;
-     }
--    else if (env_path)
-+    else if (env_path && !flatpak)
-     {
-       user_path = env_path;
-     }
--    else if (!File::Exists(user_path))
-+    else if (flatpak || !File::Exists(user_path))
-     {
-       const char* data_home = getenv("XDG_DATA_HOME");
-       std::string data_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
+