From b33260dce819012e8bd98053eb461870edfbfa80 Mon Sep 17 00:00:00 2001 From: itsmattkc <34096995+itsmattkc@users.noreply.github.com> Date: Fri, 18 Nov 2022 10:30:18 -0800 Subject: [PATCH] timebased: only snap to workarea if enabled Fixes #2106 --- app/widget/timebased/timebasedwidget.cpp | 2 +- app/widget/timeruler/seekablewidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/widget/timebased/timebasedwidget.cpp b/app/widget/timebased/timebasedwidget.cpp index 01da6beaa..a87b6dbbb 100644 --- a/app/widget/timebased/timebasedwidget.cpp +++ b/app/widget/timebased/timebasedwidget.cpp @@ -828,7 +828,7 @@ bool TimeBasedWidget::SnapPoint(const std::vector &start_times, ration } } - if ((snap_points & kSnapToWorkarea) && ruler()->GetWorkArea()) { + if ((snap_points & kSnapToWorkarea) && ruler()->GetWorkArea() && ruler()->GetWorkArea()->enabled()) { const rational &workarea_in = ruler()->GetWorkArea()->in(); const rational &workarea_out = ruler()->GetWorkArea()->out(); diff --git a/app/widget/timeruler/seekablewidget.cpp b/app/widget/timeruler/seekablewidget.cpp index d7e7b3293..dbe67fa51 100644 --- a/app/widget/timeruler/seekablewidget.cpp +++ b/app/widget/timeruler/seekablewidget.cpp @@ -491,7 +491,7 @@ bool SeekableWidget::FindResizeHandle(QMouseEvent *event) rational max = SceneToTimeNoGrid(scene.x() + border); // Test for workarea - if (workarea_) { + if (workarea_ && workarea_->enabled()) { if (workarea_->in() >= min && workarea_->in() < max) { resize_mode_ = kResizeIn; } else if (workarea_->out() >= min && workarea_->out() < max) {