Skip to content

Commit

Permalink
BUGFIX: avoid recursive deadlock
Browse files Browse the repository at this point in the history
  • Loading branch information
jlblancoc committed Sep 8, 2024
1 parent 5e5bdce commit 8664656
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion doc/source/doxygen-docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
\page changelog Change Log

# Version 2.13.9: UNRELEASED
(none yet)
- BUG FIXES:
- Fix recursive mutex lock if calling mrpt::opengl::CPointCloud::insertPoint() with signatures for mrpt::math::TPoint3D.

# Version 2.13.8: Released Sep 7th, 2024
- Changes in libraries:
Expand Down
4 changes: 2 additions & 2 deletions libs/opengl/include/mrpt/opengl/CPointCloud.h
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,12 @@ class CPointCloud :

void insertPoint(const mrpt::math::TPoint3Df& p)
{
std::unique_lock<std::shared_mutex> wfWriteLock(CRenderizableShaderPoints::m_pointsMtx.data);
// lock already hold by insertPoint() below
insertPoint(p.x, p.y, p.z);
}
void insertPoint(const mrpt::math::TPoint3D& p)
{
std::unique_lock<std::shared_mutex> wfWriteLock(CRenderizableShaderPoints::m_pointsMtx.data);
// lock already hold by insertPoint() below
insertPoint(p.x, p.y, p.z);
}

Expand Down

0 comments on commit 8664656

Please sign in to comment.