From d3999ca63d0b8d2fc3c6e580cd2583b560b903c6 Mon Sep 17 00:00:00 2001 From: Keith Edmunds Date: Fri, 5 Jan 2024 09:54:55 +0000 Subject: [PATCH] Fix moving rows between playlists --- app/musicmuster.py | 4 ++-- app/playlistmodel.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/musicmuster.py b/app/musicmuster.py index 00e9dff..ec038a3 100755 --- a/app/musicmuster.py +++ b/app/musicmuster.py @@ -1045,7 +1045,7 @@ class Window(QMainWindow, Ui_MainWindow): if self.move_source_rows is None or self.move_source_model is None: return - to_playlist_model = self.active_tab().source_model + to_playlist_model: PlaylistModel = self.active_tab().source_model selected_rows = self.active_tab().get_selected_rows() if selected_rows: destination_row = selected_rows[0] @@ -1059,7 +1059,7 @@ class Window(QMainWindow, Ui_MainWindow): self.move_source_model.move_rows(self.move_source_rows, destination_row) else: self.move_source_model.move_rows_between_playlists( - self.move_source_rows, destination_row, to_playlist_model + self.move_source_rows, destination_row, to_playlist_model.playlist_id ) self.active_tab().clear_selection() diff --git a/app/playlistmodel.py b/app/playlistmodel.py index fd7042e..12cde8c 100644 --- a/app/playlistmodel.py +++ b/app/playlistmodel.py @@ -440,7 +440,10 @@ class PlaylistModel(QAbstractTableModel): End model reset if this is our playlist """ + log.debug(f"end_reset_model({playlist_id=})") + if playlist_id != self.playlist_id: + log.debug(f"end_reset_model: not us ({self.playlist_id=})") return with Session() as session: self.refresh_data(session)