From 85badae9573528b19448f25a2040967691b525e4 Mon Sep 17 00:00:00 2001 From: the-black-eagle Date: Tue, 2 Jan 2024 13:32:59 +0000 Subject: [MUSIC] Only drop sql triggers on cleaning if they exist --- xbmc/music/MusicDatabase.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xbmc/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp index 8468168beb..91ff20846b 100644 --- a/xbmc/music/MusicDatabase.cpp +++ b/xbmc/music/MusicDatabase.cpp @@ -4444,8 +4444,11 @@ int CMusicDatabase::Cleanup(CGUIDialogProgress* progressDialog /*= nullptr*/) SetLibraryLastCleaned(); // Drop triggers song_artist and album_artist to avoid creation of entries in removed_link - m_pDS->exec("DROP TRIGGER tgrDeleteSongArtist"); - m_pDS->exec("DROP TRIGGER tgrDeleteAlbumArtist"); + // Check that triggers actually exist first as interrupting the clean causes them to not be + // re-created + + m_pDS->exec("DROP TRIGGER IF EXISTS tgrDeleteSongArtist"); + m_pDS->exec("DROP TRIGGER IF EXISTS tgrDeleteAlbumArtist"); // first cleanup any songs with invalid paths if (progressDialog) -- cgit v1.2.3