From 92eb3fc9534cd453024e3b04c1162b49391d12d0 Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Wed, 3 Jul 2024 12:52:46 +0100 Subject: [PATCH] Fix inability to close playlists --- app/musicmuster.py | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/app/musicmuster.py b/app/musicmuster.py index e3193ab..8e66d10 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -284,16 +284,23 @@ class Window(QMainWindow, Ui_MainWindow): Return True if tab closed else False. """ - # Don't close current track playlist - if track_sequence.current is None: - return True - - current_track_playlist_id = track_sequence.current.playlist_id closing_tab_playlist_id = self.tabPlaylist.widget(tab_index).playlist_id - if current_track_playlist_id: - if closing_tab_playlist_id == current_track_playlist_id: - self.show_status_message("Can't close current track playlist", 5000) - return False + + # Don't close current track playlist + if track_sequence.current is not None: + current_track_playlist_id = track_sequence.current.playlist_id + if current_track_playlist_id: + if closing_tab_playlist_id == current_track_playlist_id: + helpers.show_OK(self, "Current track", "Can't close current track playlist") + return False + + # Don't close next track playlist + if track_sequence.next is not None: + next_track_playlist_id = track_sequence.next.playlist_id + if next_track_playlist_id: + if closing_tab_playlist_id == next_track_playlist_id: + helpers.show_OK(self, "Next track", "Can't close next track playlist") + return False # Record playlist as closed and update remaining playlist tabs with db.Session() as session: @@ -896,7 +903,7 @@ class Window(QMainWindow, Ui_MainWindow): playlist.mark_open() session.commit() - self.tabPlaylist.setCurrentIndex(idx) + self.tabPlaylist.setCurrentIndex(idx) def paste_rows(self) -> None: """