imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-28 07:47:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Deadlock when loading recent files

Browse Source
This commit is contained in:
WerWolv
2022-12-28 23:06:27 +01:00
parent f7b988906e
commit cf601586fc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libimhex/include/hex/api/task.hpp
View File

@@ -110,7 +110,7 @@ namespace hex {
static void runWhenTasksFinished(const std::function<void()> &function);
private:
static std::mutex s_deferredCallsMutex;
static std::mutex s_deferredCallsMutex, s_tasksFinishedMutex;
static std::list<std::shared_ptr<Task>> s_tasks;
static std::list<std::shared_ptr<Task>> s_taskQueue;

4
lib/libimhex/source/api/task.cpp
View File

@@ -8,7 +8,7 @@
namespace hex {
std::mutex TaskManager::s_deferredCallsMutex;
std::mutex TaskManager::s_deferredCallsMutex, TaskManager::s_tasksFinishedMutex;
std::list<std::shared_ptr<Task>> TaskManager::s_tasks, TaskManager::s_taskQueue;
std::list<std::function<void()>> TaskManager::s_deferredCalls;
@@ -288,7 +288,7 @@ namespace hex {
}
void TaskManager::runWhenTasksFinished(const std::function<void()> &function) {
std::scoped_lock lock(s_deferredCallsMutex);
std::scoped_lock lock(s_tasksFinishedMutex);
s_tasksFinishedCallbacks.push_back(function);
}