From 32cad88cc60793f9ee6c11d15e8b5b71c3d725a2 Mon Sep 17 00:00:00 2001
From: Alex Barney <thealexbarney@gmail.com>
Date: Thu, 26 Aug 2021 14:18:49 -0700
Subject: [PATCH] Bugfix LibHac update to 0.13.3 and remove SD card workaround
 (#2579)

---
 Ryujinx.HLE/FileSystem/VirtualFileSystem.cs |  3 ---
 Ryujinx.HLE/HOS/LibHacHorizonManager.cs     | 13 ++-----------
 Ryujinx.HLE/Ryujinx.HLE.csproj              |  2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs b/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
index 1bd347656..580a794e3 100644
--- a/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
+++ b/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs
@@ -273,9 +273,6 @@ namespace Ryujinx.HLE.FileSystem
             rc = FixExtraDataInSpaceId(hos, SaveDataSpaceId.User);
             if (rc.IsFailure()) return rc;
 
-            rc = FixExtraDataInSpaceId(hos, SaveDataSpaceId.SdCache);
-            if (rc.IsFailure()) return rc;
-
             return Result.Success;
         }
 
diff --git a/Ryujinx.HLE/HOS/LibHacHorizonManager.cs b/Ryujinx.HLE/HOS/LibHacHorizonManager.cs
index 0444b9c55..61e0227f3 100644
--- a/Ryujinx.HLE/HOS/LibHacHorizonManager.cs
+++ b/Ryujinx.HLE/HOS/LibHacHorizonManager.cs
@@ -97,17 +97,8 @@ namespace Ryujinx.HLE.HOS
 
             try
             {
-                try
-                {
-                    RyujinxClient.Fs.CleanDirectoryRecursively("sdcard:/Nintendo/save".ToU8Span()).IgnoreResult();
-                }
-                catch (Exception) { /* We don't care about the result */ }
-
-                try
-                {
-                    RyujinxClient.Fs.DeleteDirectoryRecursively("sdcard:/save".ToU8Span()).IgnoreResult();
-                }
-                catch (Exception) { /* We don't care about the result */ }
+                RyujinxClient.Fs.CleanDirectoryRecursively("sdcard:/Nintendo/save".ToU8Span()).IgnoreResult();
+                RyujinxClient.Fs.DeleteDirectoryRecursively("sdcard:/save".ToU8Span()).IgnoreResult();
             }
             finally
             {
diff --git a/Ryujinx.HLE/Ryujinx.HLE.csproj b/Ryujinx.HLE/Ryujinx.HLE.csproj
index ca89d4133..225f622c9 100644
--- a/Ryujinx.HLE/Ryujinx.HLE.csproj
+++ b/Ryujinx.HLE/Ryujinx.HLE.csproj
@@ -20,7 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="Concentus" Version="1.1.7" />
-    <PackageReference Include="LibHac" Version="0.13.2" />
+    <PackageReference Include="LibHac" Version="0.13.3" />
     <PackageReference Include="MsgPack.Cli" Version="1.0.1" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta11" />
   </ItemGroup>