CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'PrismLauncher:develop' into mrpack-export

Browse Source
This commit is contained in:
TheKodeToad
2023-03-18 14:02:05 +00:00
committed by GitHub
parent 8837f06e4e 45b0367d14
commit 1893871a99
46 changed files with 785 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/modplatform/helpers/HashUtils.cpp
View File

@ -79,7 +79,7 @@ void FlameHasher::executeTask()
// CF-specific
auto should_filter_out = [](char c) { return (c == 9 || c == 10 || c == 13 || c == 32); };
std::ifstream file_stream(StringUtils::toStdString(m_path), std::ifstream::binary);
std::ifstream file_stream(StringUtils::toStdString(m_path).c_str(), std::ifstream::binary);
// TODO: This is very heavy work, but apparently QtConcurrent can't use move semantics, so we can't boop this to another thread.
// How do we make this non-blocking then?
m_hash = QString::number(MurmurHash2(std::move(file_stream), 4 * MiB, should_filter_out));