summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-11-24 05:58:31 +0100
committerGitHub <noreply@github.com>2018-11-24 05:58:31 +0100
commit7c4fb09a7c0a41eb328cbbe6c7774e1cf4e9c1c4 (patch)
treea4fe1b6d56c4fbbf8a18ee3ba5604a7ff510693b /src/core/hle/service
parentMerge pull request #1725 from FernandoS27/gl43 (diff)
parentfilesystem: Clear registered union paths on factory creation (diff)
downloadyuzu-7c4fb09a7c0a41eb328cbbe6c7774e1cf4e9c1c4.tar
yuzu-7c4fb09a7c0a41eb328cbbe6c7774e1cf4e9c1c4.tar.gz
yuzu-7c4fb09a7c0a41eb328cbbe6c7774e1cf4e9c1c4.tar.bz2
yuzu-7c4fb09a7c0a41eb328cbbe6c7774e1cf4e9c1c4.tar.lz
yuzu-7c4fb09a7c0a41eb328cbbe6c7774e1cf4e9c1c4.tar.xz
yuzu-7c4fb09a7c0a41eb328cbbe6c7774e1cf4e9c1c4.tar.zst
yuzu-7c4fb09a7c0a41eb328cbbe6c7774e1cf4e9c1c4.zip
Diffstat (limited to 'src/core/hle/service')
-rw-r--r--src/core/hle/service/filesystem/filesystem.cpp5
-rw-r--r--src/core/hle/service/filesystem/filesystem.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp
index 5d6294016..2aa77f68d 100644
--- a/src/core/hle/service/filesystem/filesystem.cpp
+++ b/src/core/hle/service/filesystem/filesystem.cpp
@@ -341,6 +341,10 @@ std::shared_ptr<FileSys::RegisteredCacheUnion> GetUnionContents() {
return registered_cache_union;
}
+void ClearUnionContents() {
+ registered_cache_union = nullptr;
+}
+
FileSys::RegisteredCache* GetSystemNANDContents() {
LOG_TRACE(Service_FS, "Opening System NAND Contents");
@@ -391,6 +395,7 @@ void CreateFactories(FileSys::VfsFilesystem& vfs, bool overwrite) {
bis_factory = nullptr;
save_data_factory = nullptr;
sdmc_factory = nullptr;
+ ClearUnionContents();
}
auto nand_directory = vfs.OpenDirectory(FileUtil::GetUserPath(FileUtil::UserPath::NANDDir),
diff --git a/src/core/hle/service/filesystem/filesystem.h b/src/core/hle/service/filesystem/filesystem.h
index ff9182e84..0a6cb6635 100644
--- a/src/core/hle/service/filesystem/filesystem.h
+++ b/src/core/hle/service/filesystem/filesystem.h
@@ -49,6 +49,7 @@ ResultVal<FileSys::VirtualDir> OpenSaveDataSpace(FileSys::SaveDataSpaceId space)
ResultVal<FileSys::VirtualDir> OpenSDMC();
std::shared_ptr<FileSys::RegisteredCacheUnion> GetUnionContents();
+void ClearUnionContents();
FileSys::RegisteredCache* GetSystemNANDContents();
FileSys::RegisteredCache* GetUserNANDContents();