7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 19:15:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Deadlocked by F777

Browse source
This commit is contained in:
altalk23 2024-01-24 21:48:45 +03:00
parent 70d783c299
commit 2319d19fcd
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
loader/src/loader/Index.cpp
View file

@ -507,10 +507,12 @@ std::vector<IndexItemHandle> Index::getItems() const {
}
std::vector<IndexItemHandle> Index::getLatestItems() const {
std::scoped_lock lock(m_impl->m_itemsMutex);
std::unique_lock<std::mutex> lock(m_impl->m_itemsMutex);
std::vector<IndexItemHandle> res;
for (auto& [modID, versions] : m_impl->m_items) {
lock.unlock();
res.push_back(this->getMajorItem(modID));
lock.lock();
}
return res;
}
@ -577,7 +579,7 @@ IndexItemHandle Index::getItem(
std::string const& id,
std::optional<VersionInfo> version
) const {
std::scoped_lock lock(m_impl->m_itemsMutex);
std::unique_lock<std::mutex> lock(m_impl->m_itemsMutex);
if (m_impl->m_items.count(id)) {
auto versions = m_impl->m_items.at(id);
if (version) {
@ -588,6 +590,7 @@ IndexItemHandle Index::getItem(
}
}
}
lock.unlock();
return this->getMajorItem(id);
}