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

Fix: selected time is uninitialized on layer initialization

Browse source
This commit is contained in:
Dan Paulat 2025-04-26 23:03:20 -05:00
parent 3ba569354e
commit 2f2516b998
4 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -112,6 +112,11 @@ public:
TimelineManager::TimelineManager() : p(std::make_unique<Impl>(this)) {} TimelineManager::TimelineManager() : p(std::make_unique<Impl>(this)) {}
TimelineManager::~TimelineManager() = default; TimelineManager::~TimelineManager() = default;
std::chrono::system_clock::time_point TimelineManager::GetSelectedTime() const
{
return p->selectedTime_;
}
void TimelineManager::SetMapCount(std::size_t mapCount) void TimelineManager::SetMapCount(std::size_t mapCount)
{ {
p->mapCount_ = mapCount; p->mapCount_ = mapCount;

2
scwx-qt/source/scwx/qt/manager/timeline_manager.hpp
View file

@ -24,6 +24,8 @@ public:
static std::shared_ptr<TimelineManager> Instance(); static std::shared_ptr<TimelineManager> Instance();
std::chrono::system_clock::time_point GetSelectedTime() const;
void SetMapCount(std::size_t mapCount); void SetMapCount(std::size_t mapCount);
public slots: public slots:

2
scwx-qt/source/scwx/qt/map/alert_layer.cpp
View file

@ -268,6 +268,8 @@ void AlertLayer::Initialize()
auto& alertLayerHandler = AlertLayerHandler::Instance(); auto& alertLayerHandler = AlertLayerHandler::Instance();
p->selectedTime_ = manager::TimelineManager::Instance()->GetSelectedTime();
// Take a shared lock to prevent handling additional alerts while populating // Take a shared lock to prevent handling additional alerts while populating
// initial lists // initial lists
std::shared_lock lock {alertLayerHandler.alertMutex_}; std::shared_lock lock {alertLayerHandler.alertMutex_};

2
scwx-qt/source/scwx/qt/map/placefile_layer.cpp
View file

@ -122,6 +122,8 @@ void PlacefileLayer::Initialize()
logger_->debug("Initialize()"); logger_->debug("Initialize()");
DrawLayer::Initialize(); DrawLayer::Initialize();
p->selectedTime_ = manager::TimelineManager::Instance()->GetSelectedTime();
} }
void PlacefileLayer::Render( void PlacefileLayer::Render(