app/playlistmodel.py

@@ -154,10 +154,10 @@ class PlaylistModel(QAbstractTableModel):
         if file_is_unreadable(rat.path):
             return QBrush(QColor(Config.COLOUR_UNREADABLE))
         # Current track
-        if track_sequence.current and track_sequence.current.row_number == row:
+        if track_sequence.current and track_sequence.current.track_id == rat.track_id:
             return QBrush(QColor(Config.COLOUR_CURRENT_PLAYLIST))
         # Next track
-        if track_sequence.next and track_sequence.next.row_number == row:
+        if track_sequence.next and track_sequence.next.track_id == rat.track_id:
             return QBrush(QColor(Config.COLOUR_NEXT_PLAYLIST))
 
         # Individual cell colouring
@@ -725,7 +725,7 @@ class PlaylistModel(QAbstractTableModel):
         with db.Session() as session:
             for row_number in row_numbers:
                 playlist_row = session.get(
-                    PlaylistRows, self.playlist_rows[row_number].playlistrow_id
+                    PlaylistRows, self.playlist_rows[row_number].row_number
                 )
                 if not playlist_row:
                     return
@@ -1206,6 +1206,7 @@ class PlaylistModel(QAbstractTableModel):
                 old_next_row = track_sequence.next.row_number
 
             track_sequence.set_next(rat)
+            self.invalidate_row(row_number)
 
             if Config.WIKIPEDIA_ON_NEXT:
                 self.signals.search_wikipedia_signal.emit(
@@ -1215,7 +1216,7 @@ class PlaylistModel(QAbstractTableModel):
                 self.signals.search_songfacts_signal.emit(
                     self.playlist_rows[row_number].title
                 )
-            if old_next_row is not None:
+            if old_next_row:
                 self.invalidate_row(old_next_row)
             self.invalidate_row(row_number)