app/playlists.py

@@ -422,7 +422,7 @@ class PlaylistTab(QTableWidget):
 
         # Mark next-track row as current
         current_row = self._get_next_track_row()
-        if current_row is None:
+        if not current_row:
             return
         self._set_current_track_row(current_row)
 

app/utilities.py

@@ -94,10 +94,12 @@ def create_track_from_file(session, path, normalise=None, interactive=False):
     track = Tracks.get_or_create(session, path)
     track.title = title
     track.artist = artist
+    track.duration = int(round(
+        t['duration'], Config.MILLISECOND_SIGFIGS) * 1000)
+
     if interactive:
         INFO("Parse for start, fade and silence...")
     audio = get_audio_segment(path)
-    track.duration = len(audio)
     track.start_gap = leading_silence(audio)
     track.fade_at = round(fade_point(audio) / 1000,
                           Config.MILLISECOND_SIGFIGS) * 1000