0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #927 from kthchew/fix/mingw-build

Browse Source
This commit is contained in:
Sefa Eyeoglu 2023-03-13 21:24:48 +01:00 committed by GitHub
commit e0e26a37b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats 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));

2
libraries/tomlplusplus

@ -1 +1 @@
Subproject commit 0a90913abf9390b9e08ab6d3b40ac11634553f38
Subproject commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8