Commit 074418c8 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron
Browse files

Fix dead-lock in Camera::stopAcq

parent 5fdd94cf
......@@ -281,9 +281,11 @@ void Camera::stopAcq()
AutoMutex lock(m_cond.mutex());
if (!m_armed)
return;
// Ongoing Trigger callback might run, avoid Disarm and potential deadlock
m_armed = false;
lock.unlock();
sendCommand(Requests::ABORT);
if (m_trigger_state == IDLE) // just armed
m_armed = false;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment