ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

rename variable

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-06-18 22:36:39 +03:00
parent ac8c7baff2
commit 888b22b4c7
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,24 +138,24 @@ QString hash(QByteArray data, Algorithm type)
void Hasher::executeTask()
{
m_zip_future = QtConcurrent::run(QThreadPool::globalInstance(), [this]() { return hash(m_path, m_alg); });
connect(&m_zip_watcher, &QFutureWatcher<QString>::finished, this, [this] {
if (m_zip_future.isCanceled()) {
m_future = QtConcurrent::run(QThreadPool::globalInstance(), [this]() { return hash(m_path, m_alg); });
connect(&m_watcher, &QFutureWatcher<QString>::finished, this, [this] {
if (m_future.isCanceled()) {
emitAborted();
} else if (m_result = m_zip_future.result(); m_result.isEmpty()) {
} else if (m_result = m_future.result(); m_result.isEmpty()) {
emitFailed("Empty hash!");
} else {
emitSucceeded();
emit resultsReady(m_result);
}
});
m_zip_watcher.setFuture(m_zip_future);
m_watcher.setFuture(m_future);
}
bool Hasher::abort()
{
if (m_zip_future.isRunning()) {
m_zip_future.cancel();
if (m_future.isRunning()) {
m_future.cancel();
// NOTE: Here we don't do `emitAborted()` because it will be done when `m_build_zip_future` actually cancels, which may not
// occur immediately.
return true;

4
launcher/modplatform/helpers/HashUtils.h
View File

@ -41,8 +41,8 @@ class Hasher : public Task {
QString m_path;
Algorithm m_alg;
QFuture<QString> m_zip_future;
QFutureWatcher<QString> m_zip_watcher;
QFuture<QString> m_future;
QFutureWatcher<QString> m_watcher;
};
Hasher::Ptr createHasher(QString file_path, ModPlatform::ResourceProvider provider);