Commit 3b470425 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Ensure frame position consistency for out operations.

Related to #318
parent 1ffc0b61
Pipeline #16373 passed with stage
in 17 minutes and 54 seconds
......@@ -686,7 +686,7 @@ void Monitor::slotSetZoneEnd(bool discardLastFrame)
{
Q_UNUSED(discardLastFrame);
int pos = m_glMonitor->getCurrentPos();
if (m_controller == nullptr) {
if (m_controller) {
pos++;
}
m_glMonitor->getControllerProxy()->setZoneOut(pos);
......
......@@ -799,7 +799,7 @@ void TimelineController::setOutPoint()
if (start + m_model->getItemPlaytime(id) == cursorPos) {
continue;
}
int size = cursorPos - start + 1;
int size = cursorPos - start;
m_model->requestItemResize(id, size, true, true, 0, false);
selectionFound = true;
}
......@@ -815,7 +815,7 @@ void TimelineController::setOutPoint()
if (cid >= 0) {
int start = m_model->getItemPosition(cid);
if (start + m_model->getItemPlaytime(cid) != cursorPos) {
int size = cursorPos - start + 1;
int size = cursorPos - start;
m_model->requestItemResize(cid, size, true, true, 0, false);
}
}
......
Markdown is supported
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