From: Jakob Leben <jleben@videolan.org>
Date: Sun, 31 Jan 2010 16:06:55 +0000 (+0100)
Subject: Qt: simplify playlist item deletion
X-Git-Tag: 1.1.0-ff~597
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=23f2edd6061be58328999375129dd9007b68e2d4;p=vlc

Qt: simplify playlist item deletion

No need to do that check anymore.
---

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index ba7c3e7df0..da0fccf3fe 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -808,10 +808,7 @@ void PLModel::doDeleteItem( PLItem *item, QModelIndexList *fullList )
         PL_UNLOCK;
         return;
     }
-    if( p_item->i_children == -1 )
-        playlist_DeleteFromInput( p_playlist, p_item->p_input, pl_Locked );
-    else
-        playlist_NodeDelete( p_playlist, p_item, true, false );
+    playlist_DeleteFromInput( p_playlist, p_item->p_input, pl_Locked );
     PL_UNLOCK;
 
     /* And finally, remove it from the tree */