Fix race condition when a track is loaded before the old one was unloaded, fixes Bug #1450424

1 files changed, 3 insertions, 3 deletions

diff --git a/src/basetrackplayer.cpp b/src/basetrackplayer.cpp
index 3f3b416f13..fd54d3beab 100644
--- a/src/basetrackplayer.cpp
+++ b/src/basetrackplayer.cpp
@@ -186,13 +186,13 @@ void BaseTrackPlayerImpl::slotLoadTrack(TrackPointer track, bool bPlay) {
                 this, SLOT(slotSetReplayGain(double)));
     }
 
-    //Request a new track from the reader
+    // Request a new track from the reader
     emit(loadTrack(track, bPlay));
 }
 
 void BaseTrackPlayerImpl::slotLoadFailed(TrackPointer track, QString reason) {
-    // TODO(rryan): Currently load failed doesn't clear the deck as an unload
-    // would. Should we?
+    // This slot can be delayed until a new  track is already loaded
+    // We must not unload the track here
     if (track != NULL) {
         qDebug() << "Failed to load track" << track->getLocation() << reason;
         emit(loadTrackFailed(track));