blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 01:40:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing minor data race and memory issues in Placefile Manager

Browse source
This commit is contained in:
Dan Paulat 2023-08-26 21:28:26 -05:00
parent 80c307c5fc
commit c7487281ad
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scwx-qt/source/scwx/qt/manager/placefile_manager.cpp
View file

@ -277,7 +277,7 @@ void PlacefileManager::set_placefile_url(const std::string& name,
placefileRecord->name_ = normalizedUrl; placefileRecord->name_ = normalizedUrl;
placefileRecord->placefile_ = nullptr; placefileRecord->placefile_ = nullptr;
p->placefileRecordMap_.erase(it); p->placefileRecordMap_.erase(it);
p->placefileRecordMap_.emplace(normalizedUrl, placefileRecord); p->placefileRecordMap_.insert_or_assign(normalizedUrl, placefileRecord);
lock.unlock(); lock.unlock();
@ -413,7 +413,7 @@ PlacefileManager::GetActivePlacefiles()
{ {
if (record->enabled_ && record->placefile_ != nullptr) if (record->enabled_ && record->placefile_ != nullptr)
{ {
placefiles.emplace_back(record->placefile_); placefiles.push_back(record->placefile_);
} }
} }
@ -695,6 +695,7 @@ void PlacefileManager::Impl::PlacefileRecord::ScheduleRefresh()
void PlacefileManager::Impl::PlacefileRecord::CancelRefresh() void PlacefileManager::Impl::PlacefileRecord::CancelRefresh()
{ {
std::unique_lock lock {timerMutex_};
refreshTimer_.cancel(); refreshTimer_.cancel();
} }