Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-17 18:59:21 +01:00
Code Releases Wiki Activity

fix: Occasional crash when closing providers

Browse Source
This commit is contained in:
WerWolv 2024-07-09 19:01:49 +02:00
parent 84c9c69fa3
commit d7fb1b737f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libimhex/source/api/imhex_api.cpp
View File

@ -268,7 +268,7 @@ namespace hex {
static i64 s_currentProvider = -1; static i64 s_currentProvider = -1;
static AutoReset<std::vector<std::unique_ptr<prv::Provider>>> s_providers; static AutoReset<std::vector<std::unique_ptr<prv::Provider>>> s_providers;
static AutoReset<std::list<std::unique_ptr<prv::Provider>>> s_providersToRemove; static AutoReset<std::map<prv::Provider*, std::unique_ptr<prv::Provider>>> s_providersToRemove;
namespace impl { namespace impl {
@ -430,7 +430,8 @@ namespace hex {
// Move provider over to a list of providers to delete // Move provider over to a list of providers to delete
eraseMutex.lock(); eraseMutex.lock();
auto removeIt = s_providersToRemove->emplace(s_providersToRemove->end(), std::move(*it)); auto providerToRemove = it->get();
(*s_providersToRemove)[providerToRemove] = std::move(*it);
eraseMutex.unlock(); eraseMutex.unlock();
// Remove left over references from the main provider list // Remove left over references from the main provider list
@ -443,16 +444,16 @@ namespace hex {
if (s_providers->empty()) if (s_providers->empty())
EventProviderChanged::post(provider, nullptr); EventProviderChanged::post(provider, nullptr);
EventProviderClosed::post(removeIt->get()); EventProviderClosed::post(it->get());
RequestUpdateWindowTitle::post(); RequestUpdateWindowTitle::post();
// Do the destruction of the provider in the background once all tasks have finished // Do the destruction of the provider in the background once all tasks have finished
TaskManager::runWhenTasksFinished([removeIt] { TaskManager::runWhenTasksFinished([providerToRemove] {
EventProviderDeleted::post(removeIt->get()); EventProviderDeleted::post(providerToRemove);
TaskManager::createBackgroundTask("Closing Provider", [removeIt](Task &) { TaskManager::createBackgroundTask("Closing Provider", [providerToRemove](Task &) {
eraseMutex.lock(); eraseMutex.lock();
auto provider = std::move(*removeIt); auto provider = std::move((*s_providersToRemove)[providerToRemove]);
s_providersToRemove->erase(removeIt); s_providersToRemove->erase(providerToRemove);
eraseMutex.unlock(); eraseMutex.unlock();
provider->close(); provider->close();