From bad49ed2f3dacd16355c7c433426d185d7a0537c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Vallv=C3=A9=20Navarro?= <jvallve@iri.upc.edu>
Date: Thu, 27 Jun 2019 11:15:03 +0200
Subject: [PATCH] hotfix in CaptureBase::move()
---
src/capture/capture_base.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/capture/capture_base.cpp b/src/capture/capture_base.cpp
index 830b04c57..c4dcb6a0f 100644
--- a/src/capture/capture_base.cpp
+++ b/src/capture/capture_base.cpp
@@ -292,7 +292,7 @@ void CaptureBase::setCalibration(const VectorXs& _calib)
void CaptureBase::move(FrameBasePtr _frm_ptr)
{
WOLF_WARN_COND(this->getFrame() == nullptr, "moving a capture not linked to any frame");
- WOLF_WARN_COND(_frm_ptr != nullptr, "moving a capture to a null FrameBasePtr");
+ WOLF_WARN_COND(_frm_ptr == nullptr, "moving a capture to a null FrameBasePtr");
// Unlink
if (this->getFrame())
@@ -305,6 +305,7 @@ void CaptureBase::move(FrameBasePtr _frm_ptr)
// unlink from previous non-key frame
this->getFrame()->removeCapture(shared_from_this());
+ this->setFrame(nullptr);
}
// link
--
GitLab