[vlc-devel] commit: Fix popupSave/Stream deadlock (Fabio Ritrovato )

[git version control]

vlc | branch: master | Fabio Ritrovato <exsephiroth87 at gmail.com> | Fri Mar 13 23:13:46 2009 +0100| [15edb457d5068568c996b41bbfb96b41a3fb1da2] | committer: Rémi Duraffort 

Fix popupSave/Stream deadlock

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

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

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

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index 5f35fc6..3dfaf18 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -394,20 +394,18 @@ QStringList PLModel::selectedURIs()
         PL_LOCK;
         PLItem *item = static_cast<PLItem*>
                     (current_selection[i].internalPointer());
-        if( !item )
-            continue;
-
-        input_item_t *p_item = NULL;
-        if( !p_item )
-            continue;
-
-        char *psz = input_item_GetURI( p_item );
-        if( !psz )
-            continue;
-        else
+        if( item )
         {
-            lst.append( QString( psz ) );
-            free( psz );
+            playlist_item_t *p_item = playlist_ItemGetById( p_playlist, item->i_id );
+            if( p_item )
+            {
+                char *psz = input_item_GetURI( p_item->p_input );
+                if( psz )
+                {
+                    lst.append( QString( psz ) );
+                    free( psz );
+                }
+            }
         }
         PL_UNLOCK;
     }