From 2079bb4090b97b87faf69b3a32f8c115de61002e Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Wed, 15 Jul 2020 12:16:31 -0400
Subject: filesystem: Create subdirectories prior to creating a file

If subdirectories exist in the given path parameter and don't exist in the real filesystem create them prior to creating the files within.
This fixes the softlocks upon save creation in The Legend of Zelda: Breath of the Wild
---
 src/core/hle/service/filesystem/filesystem.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/core/hle/service/filesystem/filesystem.cpp')

diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp
index cadc03805..3020101a1 100644
--- a/src/core/hle/service/filesystem/filesystem.cpp
+++ b/src/core/hle/service/filesystem/filesystem.cpp
@@ -55,6 +55,9 @@ std::string VfsDirectoryServiceWrapper::GetName() const {
 ResultCode VfsDirectoryServiceWrapper::CreateFile(const std::string& path_, u64 size) const {
     std::string path(FileUtil::SanitizePath(path_));
     auto dir = GetDirectoryRelativeWrapped(backing, FileUtil::GetParentPath(path));
+    if (dir == nullptr) {
+        dir = backing->CreateSubdirectory(FileUtil::GetParentPath(path));
+    }
     auto file = dir->CreateFile(FileUtil::GetFilename(path));
     if (file == nullptr) {
         // TODO(DarkLordZach): Find a better error code for this
-- 
cgit v1.2.3


From 5892fc1555d45a7e6382a07252d232019dd5978d Mon Sep 17 00:00:00 2001
From: Morph <39850852+Morph1984@users.noreply.github.com>
Date: Wed, 15 Jul 2020 13:08:04 -0400
Subject: Add comment to clarify the nullptr check

---
 src/core/hle/service/filesystem/filesystem.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/core/hle/service/filesystem/filesystem.cpp')

diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp
index 3020101a1..c66124998 100644
--- a/src/core/hle/service/filesystem/filesystem.cpp
+++ b/src/core/hle/service/filesystem/filesystem.cpp
@@ -55,6 +55,7 @@ std::string VfsDirectoryServiceWrapper::GetName() const {
 ResultCode VfsDirectoryServiceWrapper::CreateFile(const std::string& path_, u64 size) const {
     std::string path(FileUtil::SanitizePath(path_));
     auto dir = GetDirectoryRelativeWrapped(backing, FileUtil::GetParentPath(path));
+    // dir can be nullptr if path contains subdirectories, create those prior to creating the file.
     if (dir == nullptr) {
         dir = backing->CreateSubdirectory(FileUtil::GetParentPath(path));
     }
-- 
cgit v1.2.3