diff --git a/src/FATStorage.cpp b/src/FATStorage.cpp index c887cb4e..06b4c79f 100644 --- a/src/FATStorage.cpp +++ b/src/FATStorage.cpp @@ -289,7 +289,7 @@ void FATStorage::SaveIndex() } -bool FATStorage::ExportFile(std::string path, std::string out, fs::file_time_type& modtime) +bool FATStorage::ExportFile(std::string path, std::string out) { FF_FIL file; FILE* fout; @@ -334,8 +334,6 @@ bool FATStorage::ExportFile(std::string path, std::string out, fs::file_time_typ fclose(fout); f_close(&file); - modtime = fs::last_write_time(out); - return true; } @@ -407,9 +405,10 @@ void FATStorage::ExportDirectory(std::string path, std::string outbase, int leve if (doexport) { - fs::file_time_type modtime; - if (ExportFile("0:/"+fullpath, outbase+"/"+fullpath, modtime)) + std::string outpath = outbase+"/"+fullpath; + if (ExportFile("0:/"+fullpath, outpath)) { + fs::file_time_type modtime = fs::last_write_time(outpath); s64 modtime_raw = std::chrono::duration_cast(modtime.time_since_epoch()).count(); FileIndexEntry& entry = FileIndex[fullpath]; diff --git a/src/FATStorage.h b/src/FATStorage.h index 4574ab78..11fd9f1b 100644 --- a/src/FATStorage.h +++ b/src/FATStorage.h @@ -60,7 +60,7 @@ private: void LoadIndex(); void SaveIndex(); - bool ExportFile(std::string path, std::string out, std::filesystem::file_time_type& modtime); + bool ExportFile(std::string path, std::string out); void ExportDirectory(std::string path, std::string outbase, int level); bool DeleteHostDirectory(std::string path, std::string outbase, int level); void ExportChanges(std::string outbase); diff --git a/src/NDSCart.cpp b/src/NDSCart.cpp index db7cd264..d249050e 100644 --- a/src/NDSCart.cpp +++ b/src/NDSCart.cpp @@ -1167,7 +1167,7 @@ CartHomebrew::CartHomebrew(u8* rom, u32 len, u32 chipid) : CartCommon(rom, len, //if (Config::DLDIEnable) if (true) { - ApplyDLDIPatch(melonDLDI, sizeof(melonDLDI), true); + ApplyDLDIPatch(melonDLDI, sizeof(melonDLDI), false); SD = new FATStorage("melonDLDI.bin", 0, false, "dldi"); SD->Open(); }