Merge pull request #5230 from Montellese/smartplaylist_multivalue_fix_15313

smartplaylists: fix generated SQL query for multi-value rules with a negated parameter (fixes #15313)

1 files changed, 7 insertions, 2 deletions

diff --git a/xbmc/dbwrappers/DatabaseQuery.cpp b/xbmc/dbwrappers/DatabaseQuery.cpp
index 28ea3dce71..65564dd9dc 100644
--- a/xbmc/dbwrappers/DatabaseQuery.cpp
+++ b/xbmc/dbwrappers/DatabaseQuery.cpp
@@ -370,8 +370,13 @@ std::string CDatabaseQueryRule::GetWhereClause(const CDatabase &db, const std::s
   {
     std::string query = '(' + FormatWhereClause(negate, operatorString, *it, db, strType) + ')';
 
-    if (it+1 != m_parameter.end())
-      query += " OR ";
+    if (it + 1 != m_parameter.end())
+    {
+      if (negate.empty())
+        query += " OR ";
+      else
+        query += " AND ";
+    }
 
     wholeQuery += query;
   }