From f61dfa0529d0f623bbf8635c8783740dcc7c2758 Mon Sep 17 00:00:00 2001
From: ejurgensen <espenjurgensen@gmail.com>
Date: Sun, 29 Mar 2020 00:33:44 +0100
Subject: [PATCH] [db] db_pl_delete_bypath() must also delete disabled
 playlists

Otherwise we end up with a bunch of disabled playlists in the db.
---
 src/db.c | 9 +++++++--
 src/db.h | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/db.c b/src/db.c
index f2e6e3ce..32929c47 100644
--- a/src/db.c
+++ b/src/db.c
@@ -1664,10 +1664,14 @@ db_build_query_clause(struct query_params *qp)
   else
     qc->group = sqlite3_mprintf("");
 
-  if (qp->filter)
+  if (qp->filter && !qp->with_disabled)
     qc->where = sqlite3_mprintf("WHERE f.disabled = 0 AND %s", qp->filter);
-  else
+  else if (!qp->with_disabled)
     qc->where = sqlite3_mprintf("WHERE f.disabled = 0");
+  else if (qp->filter)
+    qc->where = sqlite3_mprintf("WHERE %s", qp->filter);
+  else
+    qc->where = sqlite3_mprintf("");
 
   if (qp->having && (qp->type & (Q_GROUP_ALBUMS | Q_GROUP_ARTISTS)))
     qc->having = sqlite3_mprintf("HAVING %s", qp->having);
@@ -3653,6 +3657,7 @@ db_pl_delete_bypath(const char *path)
   memset(&qp, 0, sizeof(struct query_params));
 
   qp.type = Q_PL;
+  qp.with_disabled = 1;
   CHECK_NULL(L_DB, qp.filter = db_mprintf("path = '%q'", path));
 
   ret = db_query_start(&qp);
diff --git a/src/db.h b/src/db.h
index b1f5a1a8..8186db2b 100644
--- a/src/db.h
+++ b/src/db.h
@@ -99,6 +99,8 @@ struct query_params {
 
   char *filter;
 
+  int with_disabled;
+
   /* Query results, filled in by query_start */
   int results;