diff --git a/src/library/dlgtrackinfo.cpp b/src/library/dlgtrackinfo.cpp index 69904b12f3d9..9c9b14257fb8 100644 --- a/src/library/dlgtrackinfo.cpp +++ b/src/library/dlgtrackinfo.cpp @@ -294,7 +294,7 @@ void DlgTrackInfo::slotApply() { } void DlgTrackInfo::slotOk() { - slotApply(); + saveTrack(); clear(); accept(); } diff --git a/src/library/dlgtrackinfomulti.cpp b/src/library/dlgtrackinfomulti.cpp index ff3dca9bfb88..9b5ca7148605 100644 --- a/src/library/dlgtrackinfomulti.cpp +++ b/src/library/dlgtrackinfomulti.cpp @@ -290,23 +290,18 @@ void DlgTrackInfoMulti::slotApply() { void DlgTrackInfoMulti::slotOk() { slotApply(); - clear(); accept(); } void DlgTrackInfoMulti::slotCancel() { - clear(); reject(); } void DlgTrackInfoMulti::loadTracks(const QList& pTracks) { - clear(); - if (pTracks.isEmpty()) { return; } - m_pLoadedTracks.clear(); for (const auto& pTrack : pTracks) { m_pLoadedTracks.insert(pTrack.get()->getId(), pTrack); } @@ -676,19 +671,6 @@ void DlgTrackInfoMulti::saveTracks() { updateFromTracks(); } -void DlgTrackInfoMulti::clear() { - const QSignalBlocker signalBlocker(this); - - disconnectTracksChanged(); - m_pLoadedTracks.clear(); - m_trackRecords.clear(); - - m_pWStarRating->slotSetRating(0); - trackColorDialogSetColorStyleButton(mixxx::RgbColor::nullopt()); - m_pWCoverArtLabel->loadTrack(TrackPointer()); - m_pWCoverArtLabel->setCoverArt(CoverInfo(), QPixmap()); -} - void DlgTrackInfoMulti::connectTracksChanged() { for (const auto& pTrack : std::as_const(m_pLoadedTracks)) { connect(pTrack.get(), diff --git a/src/library/dlgtrackinfomulti.h b/src/library/dlgtrackinfomulti.h index 15cceec283cc..5ef4096e23cb 100644 --- a/src/library/dlgtrackinfomulti.h +++ b/src/library/dlgtrackinfomulti.h @@ -65,7 +65,6 @@ class DlgTrackInfoMulti : public QDialog, public Ui::DlgTrackInfoMulti { void init(); void loadTracksInternal(const QList& pTracks); void saveTracks(); - void clear(); void connectTracksChanged(); void disconnectTracksChanged();