diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-03-13 21:24:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-13 21:24:48 +0100 |
| commit | e0e26a37b530254383fbb7b6853e8e3358f7100d (patch) | |
| tree | 0dfa6ceb7d495918c740e982ac395116cfa90da1 | |
| parent | 15a0c036644aeebf4a1521d331109af09eb597dc (diff) | |
| parent | 430369feb8712b314b0c31deef43435fe94a4f45 (diff) | |
| download | PrismLauncher-e0e26a37b530254383fbb7b6853e8e3358f7100d.tar.gz PrismLauncher-e0e26a37b530254383fbb7b6853e8e3358f7100d.tar.bz2 PrismLauncher-e0e26a37b530254383fbb7b6853e8e3358f7100d.zip | |
Merge pull request #927 from kthchew/fix/mingw-build
| -rw-r--r-- | launcher/modplatform/helpers/HashUtils.cpp | 2 | ||||
| m--------- | libraries/tomlplusplus | 0 |
2 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)); diff --git a/libraries/tomlplusplus b/libraries/tomlplusplus -Subproject 0a90913abf9390b9e08ab6d3b40ac11634553f3 +Subproject 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b |