[vlc-commits] commit: skins2: playlist (simplify) (Erwan Tulou )

git at videolan.org git at videolan.org
Thu Aug 5 16:33:57 CEST 2010


vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Thu Aug  5 16:17:29 2010 +0200| [6141b54e820e8d9bc5ac103d01cfb5a8f77da891] | committer: Erwan Tulou 

skins2: playlist (simplify)

getNextSibling was buggy (previous patch), and the only use doesn't seem right.

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

 modules/gui/skins2/vars/playtree.cpp |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp
index 2407e38..05cb89f 100644
--- a/modules/gui/skins2/vars/playtree.cpp
+++ b/modules/gui/skins2/vars/playtree.cpp
@@ -73,18 +73,15 @@ void Playtree::delSelected()
             {
                 playlist_DeleteFromInput( getIntf()->p_sys->p_playlist,
                                           p_item->p_input, pl_Locked );
-                it2 = getNextVisibleItem( it ) ;
-                it->parent()->removeChild( it );
-                it = it2;
             }
             else
             {
                 playlist_NodeDelete( getIntf()->p_sys->p_playlist, p_item,
                                      true, false );
-                it2 = getNextSibling( it );
-                it->parent()->removeChild( it );
-                it = it2;
             }
+            it2 = getNextVisibleItem( it ) ;
+            it->parent()->removeChild( it );
+            it = it2;
         }
         else
         {



More information about the vlc-commits mailing list