From: Fabio Ritrovato <exsephiroth87@gmail.com>
Date: Fri, 13 Mar 2009 22:13:46 +0000 (+0100)
Subject: Fix popupSave/Stream deadlock
X-Git-Tag: 1.0.0-pre1~73
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=15edb457d5068568c996b41bbfb96b41a3fb1da2;p=vlc

Fix popupSave/Stream deadlock

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

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index 5f35fc63d2..3dfaf18b08 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;
     }