Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing nullptr checks #2527

Merged
merged 1 commit into from Mar 1, 2020
Merged

Add missing nullptr checks #2527

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 14 additions & 16 deletions src/widget/wtracktableview.cpp
View file
Open in desktop
Expand Up @@ -571,11 +571,9 @@ void WTrackTableView::slotMouseDoubleClicked(const QModelIndex &index) {
}

TrackPointer pTrack = trackModel->getTrack(index);
VERIFY_OR_DEBUG_ASSERT(pTrack) {
return;
if (pTrack) {
emit loadTrack(pTrack);
}

emit(loadTrack(pTrack));
} else if (doubleClickAction == DlgPrefLibrary::ADD_TO_AUTODJ_BOTTOM
&& modelHasCapabilities(TrackModel::TRACKMODELCAPS_ADDTOAUTODJ)) {
sendToAutoDJ(PlaylistDAO::AutoDJSendLoc::BOTTOM);
Expand Down Expand Up @@ -1811,13 +1809,11 @@ void WTrackTableView::slotScaleBpm(int scale) {

QModelIndexList selectedTrackIndices = selectionModel()->selectedRows();
for (const auto& index : selectedTrackIndices) {
TrackPointer track = trackModel->getTrack(index);
if (!track->isBpmLocked()) { // bpm is not locked
BeatsPointer beats = track->getBeats();
if (beats != nullptr) {
beats->scale(static_cast<Beats::BPMScale>(scale));
} else {
continue;
TrackPointer pTrack = trackModel->getTrack(index);
if (pTrack && !pTrack->isBpmLocked()) {
BeatsPointer pBeats = pTrack->getBeats();
if (pBeats) {
pBeats->scale(static_cast<Beats::BPMScale>(scale));
}
}
}
Expand All @@ -1832,8 +1828,10 @@ void WTrackTableView::lockBpm(bool lock) {
QModelIndexList selectedTrackIndices = selectionModel()->selectedRows();
// TODO: This should be done in a thread for large selections
for (const auto& index : selectedTrackIndices) {
TrackPointer track = trackModel->getTrack(index);
track->setBpmLocked(lock);
TrackPointer pTrack = trackModel->getTrack(index);
if (pTrack) {
pTrack->setBpmLocked(lock);
}
}
}

Expand All @@ -1846,9 +1844,9 @@ void WTrackTableView::slotClearBeats() {
QModelIndexList selectedTrackIndices = selectionModel()->selectedRows();
// TODO: This should be done in a thread for large selections
for (const auto& index : selectedTrackIndices) {
TrackPointer track = trackModel->getTrack(index);
if (!track->isBpmLocked()) {
track->setBeats(BeatsPointer());
TrackPointer pTrack = trackModel->getTrack(index);
if (pTrack && !pTrack->isBpmLocked()) {
pTrack->setBeats(BeatsPointer());
}
}
}
Expand Down