Remove some unnecessary changes.

This commit is contained in:
goeiecool9999 2022-09-08 02:19:07 +02:00 committed by klaas
parent 00f8f9199b
commit 9402789146
6 changed files with 8 additions and 9 deletions

View file

@ -175,7 +175,7 @@ std::error_code Account::Load()
std::error_code Account::Save() std::error_code Account::Save()
{ {
FSPath path = CemuApp::GetMLCPath(fmt::format(L"usr/save/system/act/{:08x}", m_persistent_id)).ToStdWstring(); fs::path path = CemuApp::GetMLCPath(fmt::format(L"usr/save/system/act/{:08x}", m_persistent_id)).ToStdWstring();
if (!fs::exists(path)) if (!fs::exists(path))
{ {
std::error_code ec; std::error_code ec;

View file

@ -1,5 +1,5 @@
#include "Cafe/Filesystem/fsc.h" #include "Cafe/Filesystem/fsc.h"
#include "FSPath.h" #include "Cafe/Filesystem/FSPath.h"
class FSCVirtualFile_Host : public FSCVirtualFile class FSCVirtualFile_Host : public FSCVirtualFile
{ {

View file

@ -16,7 +16,7 @@ std::string SaveInfo::GetStorageSubpathByTitleId(TitleId titleId)
return fmt::format("usr/save/{:08x}/{:08x}", ((uint64)titleId) >> 32, (uint64)titleId & 0xFFFFFFFF); return fmt::format("usr/save/{:08x}/{:08x}", ((uint64)titleId) >> 32, (uint64)titleId & 0xFFFFFFFF);
} }
FSPath SaveInfo::GetSavePath(TitleId titleId) fs::path SaveInfo::GetSavePath(TitleId titleId)
{ {
return ActiveSettings::GetMlcPath(GetStorageSubpathByTitleId(titleId)); return ActiveSettings::GetMlcPath(GetStorageSubpathByTitleId(titleId));
} }

View file

@ -2,7 +2,6 @@
#include "TitleId.h" #include "TitleId.h"
#include "ParsedMetaXml.h" #include "ParsedMetaXml.h"
#include "Cafe/Filesystem/FSPath.h"
class SaveInfo class SaveInfo
{ {
@ -21,10 +20,10 @@ public:
private: private:
static std::string GetStorageSubpathByTitleId(TitleId titleId); static std::string GetStorageSubpathByTitleId(TitleId titleId);
static FSPath GetSavePath(TitleId titleId); static fs::path GetSavePath(TitleId titleId);
TitleId m_titleId; TitleId m_titleId;
FSPath m_path; fs::path m_path;
bool m_isValid{false}; bool m_isValid{false};
bool m_hasMetaLoaded{false}; bool m_hasMetaLoaded{false};
ParsedMetaXml* m_parsedMetaXml{nullptr}; ParsedMetaXml* m_parsedMetaXml{nullptr};

View file

@ -2,7 +2,7 @@
#include <charconv> #include <charconv>
std::mutex sSLMutex; std::mutex sSLMutex;
FSPath sSLMLCPath; fs::path sSLMLCPath;
std::vector<SaveInfo*> sSLList; std::vector<SaveInfo*> sSLList;
@ -59,7 +59,7 @@ void CafeSaveList::RefreshThreadWorker()
sSLList.clear(); sSLList.clear();
sSLMutex.lock(); sSLMutex.lock();
FSPath mlcPath = sSLMLCPath; fs::path mlcPath = sSLMLCPath;
sSLMutex.unlock(); sSLMutex.unlock();
std::error_code ec; std::error_code ec;
for (auto it_titleHigh : fs::directory_iterator(mlcPath / "usr/save", ec)) for (auto it_titleHigh : fs::directory_iterator(mlcPath / "usr/save", ec))

View file

@ -289,7 +289,7 @@ void TitleInfo::CalcUID()
} }
std::error_code ec; std::error_code ec;
// get absolute normalized path // get absolute normalized path
FSPath normalizedPath; fs::path normalizedPath;
if (m_fullPath.is_relative()) if (m_fullPath.is_relative())
{ {
normalizedPath = ActiveSettings::GetPath(); normalizedPath = ActiveSettings::GetPath();