diff options
| author | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2020-04-10 15:39:31 +0200 |
|---|---|---|
| committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2020-04-10 15:51:19 +0200 |
| commit | 8609c4ad5b2be1217ded66aa31738daa25b4a9c8 (patch) | |
| tree | 5fc84d86fd9ed1c3ab474a57f3344b0785e2cb07 | |
| parent | be9ca95e9ab3be296177bf6ec0f1b05f7ade8749 (diff) | |
| download | qtlocation-mapboxgl-upstream/lp-fix-doubled-image-removal.tar.gz | |
when removing an image use the correct list ptr for presence verificationupstream/lp-fix-doubled-image-removal
This fixes an issues where calling `removeImage` would crash if the image was not present and the original list was not empty.
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | src/mbgl/style/style_impl.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ceec9882f..5b333d4b00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/src/mbgl/style/style_impl.cpp b/src/mbgl/style/style_impl.cpp index 52f39b52d4..25cd122b81 100644 --- a/src/mbgl/style/style_impl.cpp +++ b/src/mbgl/style/style_impl.cpp @@ -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; } |