dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: race condition on ResourceFolderModel tests

Browse source 
This (hopefully) fixes the race contiditions that sometimes got
triggered in tests.

Signed-off-by: flow <flowlnlnln@gmail.com>
This commit is contained in:
flow 2022-09-03 13:25:05 -03:00
parent 3b13e692d2
commit 42c81395b3
No known key found for this signature in database
GPG key ID: 8D0F221F0A59F469
9 changed files with 46 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

6
launcher/minecraft/mod/tasks/BasicFolderLoadTask.h
View file

@ -36,7 +36,7 @@ class BasicFolderLoadTask : public Task {
[[nodiscard]] bool canAbort() const override { return true; }
bool abort() override
{
m_aborted = true;
m_aborted.store(true);
return true;
}
@ -49,7 +49,7 @@ class BasicFolderLoadTask : public Task {
}
if (m_aborted)
emitAborted();
emit finished();
else
emitSucceeded();
}
@ -58,7 +58,7 @@ private:
QDir m_dir;
ResultPtr m_result;
bool m_aborted = false;
std::atomic<bool> m_aborted = false;
std::function<Resource*(QFileInfo const&)> m_create_func;
};