pl_delete_all_meta doesn't delete properties (starting with ':') anymore

1 files changed, 20 insertions, 8 deletions

diff --git a/playlist.c b/playlist.c
index 2205c0ef..f843aba8 100644
--- a/playlist.c
+++ b/playlist.c
@@ -2468,14 +2468,26 @@ pl_reshuffle (playItem_t **ppmin, playItem_t **ppmax) {
 void
 pl_delete_all_meta (playItem_t *it) {
     LOCK;
-    while (it->meta) {
-        DB_metaInfo_t *m = it->meta;
-        it->meta = m->next;
-        metacache_remove_string (m->key);
-        metacache_remove_string (m->value);
-        free (m);
-    }
-    it->meta = NULL;
+    DB_metaInfo_t *m = it->meta;
+    DB_metaInfo_t *prev = NULL;
+    while (m) {
+        DB_metaInfo_t *next = m->next;
+        if (m->key[0] == ':') {
+            prev = m;
+        }
+        else {
+            if (prev) {
+                prev->next = next;
+            }
+            else {
+                it->meta = next;
+            }
+            metacache_remove_string (m->key);
+            metacache_remove_string (m->value);
+            free (m);
+        }
+        m = next;
+    }
     UNLOCK;
 }