[vlc-commits] sd: always force item deletion

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun May 14 16:23:54 2017 +0300| [4659534d716a0a0ad086b0d259d9c3d4102e9bb6] | committer: Rémi Denis-Courmont

sd: always force item deletion

All SD items should bee inserted into the playlist as read-only.
Deletion would need to be forced. Besides, this is simpler.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4659534d716a0a0ad086b0d259d9c3d4102e9bb6
---

 src/playlist/services_discovery.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index b64893a7c9..cdcfa81cf6 100644
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -98,10 +98,8 @@ static void playlist_sd_item_removed(services_discovery_t *sd,
     /* if the item was added under a category and the category node
        becomes empty, delete that node as well */
     if (node != sds->node && node->i_children == 1)
-        playlist_NodeDelete(p_playlist, node, true);
-    else
-        playlist_NodeDelete(p_playlist, item, true);
-
+        item = node;
+    playlist_NodeDelete(p_playlist, item, true);
     PL_UNLOCK;
 }