From ad071bb74b22459da7f9e8f0be47295b98135108 Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Fri, 10 Mar 2023 23:10:54 +0000 Subject: [PATCH] Consistently use clear_next() to clear next track --- app/musicmuster.py | 6 +++--- app/playlists.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/musicmuster.py b/app/musicmuster.py index 4c3c8a4..ce84388 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -531,7 +531,7 @@ class Window(QMainWindow, Ui_MainWindow): # Attempt to close next track playlist if self.tabPlaylist.widget(tab_index) == self.next_track.playlist_tab: - self.next_track.playlist_tab.mark_unnext() + self.next_track.playlist_tab.clear_next() # Record playlist as closed and update remaining playlist tabs with Session() as session: @@ -1272,7 +1272,7 @@ class Window(QMainWindow, Ui_MainWindow): self.current_track.playlist_tab != self.visible_playlist_tab() and self.previous_track.plr_id ): - self.previous_track.playlist_tab.reset_next() + self.previous_track.playlist_tab.clear_next() # Update headers self.update_headers() @@ -1552,7 +1552,7 @@ class Window(QMainWindow, Ui_MainWindow): # Discard now-incorrect next_track PlaylistTrack and tell # playlist_tab too - self.next_track.playlist_tab.reset_next() + self.next_track.playlist_tab.clear_next() self.clear_next() # Populate self.next_track diff --git a/app/playlists.py b/app/playlists.py index df41b9d..a98999a 100644 --- a/app/playlists.py +++ b/app/playlists.py @@ -712,7 +712,7 @@ class PlaylistTab(QTableWidget): for row in sorted(row_numbers, reverse=True): self.removeRow(row) - def reset_next(self) -> None: + def clear_next(self) -> None: """ Unmark next track """ @@ -973,7 +973,7 @@ class PlaylistTab(QTableWidget): # Unmark as next if next_row: self._add_context_menu("Unmark as next track", - self.reset_next) + self.clear_next) # ---------------------- self.menu.addSeparator()