[vlc-commits] macosx: fixed a crash when rebuilding the playlist view on quit

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Feb 19 22:20:12 2012 +0100| [9ccbd8d804ea236087553d3827d56160b39b8741] | committer: Jean-Baptiste Kempf

macosx: fixed a crash when rebuilding the playlist view on quit
(cherry picked from commit c7f4fdf8f42253fa17620fd357c78c953a510d72)

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

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=9ccbd8d804ea236087553d3827d56160b39b8741
---

 modules/gui/macosx/playlist.m |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 820f40b..9757005 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -1392,7 +1392,13 @@
                                 forTableColumn:(NSTableColumn *)tableColumn
                                 item:(id)item
 {
-    playlist_t *p_playlist = pl_Get( VLCIntf );
+    /* this method can be called when VLC is already dead, hence the extra checks */
+    intf_thread_t * p_intf = VLCIntf;
+    if (!p_intf)
+        return;
+    playlist_t *p_playlist = pl_Get( p_intf );
+    if (!p_playlist)
+        return;
 
     id o_playing_item;