Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
when removing an image use the correct list ptr for presence verifica…
Browse files Browse the repository at this point in the history
…tion

This fixes an issues where calling `removeImage` would crash if the image was not present and the original list was not empty.
  • Loading branch information
LukasPaczos committed Apr 10, 2020
1 parent be9ca95 commit 8609c4a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@

The `symbolIntersectsTileEdges()` util in `mbgl::TilePlacement` now considers icon shift for the variable symbols with enabled icon-text-fit setting, thus providing more accurate results.

- [core] Correctly log a warning instead of crashing when a non-existent image is attempted to be removed. ([#16391](https://github.com/mapbox/mapbox-gl-native/pull/16391))

## maps-v1.5.1

### 🐞 Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion src/mbgl/style/style_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ void Style::Impl::removeImage(const std::string& id) {
auto newImages = makeMutable<ImageImpls>(*images);
auto found =
std::find_if(newImages->begin(), newImages->end(), [&id](const auto& image) { return image->id == id; });
if (found == images->end()) {
if (found == newImages->end()) {
Log::Warning(Event::General, "Image '%s' is not present in style, cannot remove", id.c_str());
return;
}
Expand Down

0 comments on commit 8609c4a

Please sign in to comment.