diff options
| author | TheKodeToad <TheKodeToad@proton.me> | 2023-03-18 14:02:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 14:02:05 +0000 |
| commit | 1893871a99d26955e411b0b5dba4d2fe4368d96e (patch) | |
| tree | 998873a40d3da6622854b3fb84d973f7b29d70a3 /launcher/modplatform | |
| parent | 8837f06e4e97ed966662b52db206facd7f91a489 (diff) | |
| parent | 45b0367d14f38d40af5cc8603f7daab05d83af5f (diff) | |
| download | PrismLauncher-1893871a99d26955e411b0b5dba4d2fe4368d96e.tar.gz PrismLauncher-1893871a99d26955e411b0b5dba4d2fe4368d96e.tar.bz2 PrismLauncher-1893871a99d26955e411b0b5dba4d2fe4368d96e.zip | |
Merge branch 'PrismLauncher:develop' into mrpack-export
Diffstat (limited to 'launcher/modplatform')
| -rw-r--r-- | launcher/modplatform/helpers/HashUtils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/modplatform/helpers/HashUtils.cpp b/launcher/modplatform/helpers/HashUtils.cpp index 2177ddad..81c94e1b 100644 --- a/launcher/modplatform/helpers/HashUtils.cpp +++ b/launcher/modplatform/helpers/HashUtils.cpp @@ -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)); |