From 9ccbd8d804ea236087553d3827d56160b39b8741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Sun, 19 Feb 2012 22:20:12 +0100
Subject: [PATCH] macosx: fixed a crash when rebuilding the playlist view on
quit (cherry picked from commit c7f4fdf8f42253fa17620fd357c78c953a510d72)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---
modules/gui/macosx/playlist.m | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 820f40b861..97570056e6 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;
--
2.25.4