archive/Cemu
1
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2025-07-05 06:21:19 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some dumb mistakes.

Browse source
This commit is contained in:
goeiecool9999 2022-09-07 20:45:55 +02:00 • committed by klaas
parent d5f6cd5bd6
commit b1b6a5d8c3
5 changed files with 13 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Cafe/Filesystem/FSPath.cpp
View file

@ -1,11 +1,15 @@
#include "FSPath.h"
#ifndef BOOST_OS_UNIX
FSPath& FSPath::operator/= (const FSPath & other)
FSPath& FSPath::operator/ (const FSPath & other)
{
*this /= other;
return *this;
}
#ifndef BOOST_OS_UNIX
FSPath& FSPath::operator/= (const FSPath & other)
{
fs::path::operator/=(other);
}
#else
FSPath& FSPath::operator/= (const FSPath & other)
{

8
src/Cafe/Filesystem/FSPath.h
View file

@ -9,10 +9,10 @@ class FSPath : public fs::path {
FSPath(const T & other) : fs::path(other) {};
template <class T>
static FSPath Convert(const T& input) {
FSPath p;
p /= input;
return p;
static FSPath Convert(const T& input)
{
return FSPath{} / input;
}
FSPath& operator/= (const FSPath & other);
FSPath& operator/ (const FSPath & other);
};

17
src/Cafe/Filesystem/fscDeviceHostFS.cpp
View file

@ -222,25 +222,10 @@ FSCVirtualFile* FSCVirtualFile_Host::OpenFile(const FSPath& path, FSC_ACCESS_FLA
class fscDeviceHostFSC : public fscDeviceC {
public:
FSCVirtualFile* fscDeviceOpenByPathIgnoreCase(std::wstring_view pathString, FSC_ACCESS_FLAG accessFlags, sint32* fscStatus)
{
*fscStatus = FSC_STATUS_OK;
FSPath correctedPath = FSPath::Convert(pathString);
return FSCVirtualFile_Host::OpenFile(correctedPath, accessFlags, *fscStatus);
}
FSCVirtualFile* fscDeviceOpenByPath(std::wstring_view path, FSC_ACCESS_FLAG accessFlags, void* ctx, sint32* fscStatus) override
{
*fscStatus = FSC_STATUS_OK;
FSCVirtualFile* vf = FSCVirtualFile_Host::OpenFile(path, accessFlags, *fscStatus);
#ifdef BOOST_OS_UNIX
// failed to open file. maybe the case is different?
if (!vf)
{
vf = fscDeviceOpenByPathIgnoreCase(path, accessFlags, fscStatus);
}
#endif
FSCVirtualFile* vf = FSCVirtualFile_Host::OpenFile(FSPath::Convert(path), accessFlags, *fscStatus);
cemu_assert_debug((bool)vf == (*fscStatus == FSC_STATUS_OK));
return vf;
}

2
src/config/ActiveSettings.cpp
View file

@ -223,7 +223,7 @@ FSPath ActiveSettings::GetMlcPath()
FSPath ActiveSettings::GetMlcPath(std::string_view p)
{
std::basic_string_view<char8_t> s((const char8_t*)p.data(), p.size());
return GetMlcPath() / fs::path(s);
return GetMlcPath() / FSPath(s);
}
fs::path ActiveSettings::GetDefaultMLCPath()

2
src/config/ActiveSettings.h
View file

@ -43,7 +43,7 @@ public:
{
cemu_assert_debug(format.empty() || (format[0] != '/' && format[0] != '\\'));
auto tmp = fmt::format(fmt::runtime(format), std::forward<TArgs>(args)...);
return GetMlcPath() / fs::path(_asUtf8(tmp));
return GetMlcPath() / FSPath(_asUtf8(tmp));
}
template <typename ...TArgs>