ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV9: support old config files that specify a file name, but no path

This commit is contained in:
TheLastRar 2020-11-16 20:19:22 +00:00 committed by refractionpcsx2
parent b76abc3550
commit 64bc5409d1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcsx2/DEV9/DEV9.cpp
View File

@ -27,6 +27,7 @@
#include <err.h> #include <err.h>
#endif #endif
#include "ghc/filesystem.h"
#include <fcntl.h> #include <fcntl.h>
#include <stdlib.h> #include <stdlib.h>
@ -37,8 +38,9 @@
#include "DEV9.h" #include "DEV9.h"
#undef EXTERN #undef EXTERN
#include "Config.h" #include "Config.h"
#include "AppConfig.h"
#include "smap.h" #include "smap.h"
#include "ata.h"
#ifdef _WIN32 #ifdef _WIN32
#pragma warning(disable : 4244) #pragma warning(disable : 4244)
@ -250,7 +252,19 @@ s32 DEV9open(void* pDsp)
#else #else
DEV9_LOG("open r+: %s\n", config.Hdd); DEV9_LOG("open r+: %s\n", config.Hdd);
#endif #endif
config.HddSize = 8 * 1024;
#ifdef _WIN32
ghc::filesystem::path hddPath(std::wstring(config.Hdd));
#else
ghc::filesystem::path hddPath(config.Hdd);
#endif
if (hddPath.is_relative())
{
//GHC uses UTF8 on all platforms
ghc::filesystem::path path(GetSettingsFolder().ToUTF8().data());
hddPath = path / hddPath;
}
#ifdef ENABLE_ATA #ifdef ENABLE_ATA
ata_init(); ata_init();