[vlc-commits] Qt4: only apply search to inserted items when search isn't empty

Ilkka Ollakka git at videolan.org
Sun Jan 22 17:59:30 CET 2012


vlc/vlc-1.2 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun Jan 22 01:36:32 2012 +0200| [06d2cdf7b3b5b4d4253a77f7c08da4bb3084c379] | committer: Jean-Baptiste Kempf

Qt4: only apply search to inserted items when search isn't empty

This means we don't rebuild() everything with every item when we populate
playlist without search
(cherry picked from commit f043aa0e11894803f8b0f6f9f940a660d3a36069)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=06d2cdf7b3b5b4d4253a77f7c08da4bb3084c379
---

 .../gui/qt4/components/playlist/playlist_model.cpp |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index a23f9c9..2ee821e 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -655,6 +655,7 @@ void PLModel::processItemAppend( int i_item, int i_parent )
     if( newItem->inputItem() == THEMIM->currentInputItem() )
         emit currentIndexChanged( index( newItem, 0 ) );
 
+    if( latestSearch.isEmpty() ) return;
     search( latestSearch, index( rootItem, 0), false /*FIXME*/ );
 }
 



More information about the vlc-commits mailing list