Skip to content
Snippets Groups Projects
Commit 302fb1f6 authored by Paul Licameli's avatar Paul Licameli Committed by Paul Licameli
Browse files

Fix crash when dragging clips between tracks with sync lock on

parent d09510c9
No related branches found
No related tags found
No related merge requests found
...@@ -363,7 +363,10 @@ void ClipMoveState::Init( ...@@ -363,7 +363,10 @@ void ClipMoveState::Init(
for ( auto pTrack2 : group ) { for ( auto pTrack2 : group ) {
if (pTrack2 == &track) if (pTrack2 == &track)
continue; continue;
if (!pTrack2->IsLeader())
continue;
// shifters maps from leader tracks only
auto &shifter2 = *shifters[pTrack2]; auto &shifter2 = *shifters[pTrack2];
auto size = shifter2.MovingIntervals().size(); auto size = shifter2.MovingIntervals().size();
shifter2.SelectInterval(*interval); shifter2.SelectInterval(*interval);
...@@ -832,8 +835,10 @@ UIHandle::Result TimeShiftHandle::Drag ...@@ -832,8 +835,10 @@ UIHandle::Result TimeShiftHandle::Drag
const wxMouseEvent &event = evt.event; const wxMouseEvent &event = evt.event;
auto &viewInfo = ViewInfo::Get( *pProject ); auto &viewInfo = ViewInfo::Get( *pProject );
auto &trackList = TrackList::Get(*pProject);
ChannelView *trackView = dynamic_cast<ChannelView*>(evt.pCell.get()); ChannelView *trackView = dynamic_cast<ChannelView*>(evt.pCell.get());
Track *track = trackView ? trackView->FindTrack().get() : nullptr; Track *track =
*trackList.FindLeader(trackView ? trackView->FindTrack().get() : nullptr);
// Uncommenting this permits drag to continue to work even over the controls area // Uncommenting this permits drag to continue to work even over the controls area
/* /*
...@@ -853,9 +858,6 @@ UIHandle::Result TimeShiftHandle::Drag ...@@ -853,9 +858,6 @@ UIHandle::Result TimeShiftHandle::Drag
if (!pTrack) if (!pTrack)
return RefreshCode::RefreshNone; return RefreshCode::RefreshNone;
auto &trackList = TrackList::Get( *pProject );
// GM: slide now implementing snap-to // GM: slide now implementing snap-to
// samples functionality based on sample rate. // samples functionality based on sample rate.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment