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

Destroy layer after deinitialize call is complete

Browse source 
MapLibre seems to relatively consistently not destroy layers the first time layers are removed and re-added
This commit is contained in:
Dan Paulat 2024-06-26 22:49:44 -05:00
parent 76cd000650
commit daf1ff39e5
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scwx-qt/source/scwx/qt/map/layer_wrapper.cpp
View file

@ -31,17 +31,31 @@ LayerWrapper& LayerWrapper::operator=(LayerWrapper&&) noexcept = default;
void LayerWrapper::initialize() void LayerWrapper::initialize()
{ {
p->layer_->Initialize(); auto& layer = p->layer_;
if (layer != nullptr)
{
layer->Initialize();
}
} }
void LayerWrapper::render(const QMapLibre::CustomLayerRenderParameters& params) void LayerWrapper::render(const QMapLibre::CustomLayerRenderParameters& params)
{ {
p->layer_->Render(params); auto& layer = p->layer_;
if (layer != nullptr)
{
layer->Render(params);
}
} }
void LayerWrapper::deinitialize() void LayerWrapper::deinitialize()
{ {
p->layer_->Deinitialize(); // Ensure layers are not retained after call to deinitialize
auto& layer = p->layer_;
if (layer != nullptr)
{
layer->Deinitialize();
layer = nullptr;
}
} }
} // namespace map } // namespace map