From 9be4d7c04a508b727d0b374164325d24e719e43a Mon Sep 17 00:00:00 2001 From: Jean-Paul Saman Date: Mon, 18 Apr 2005 18:13:37 +0000 Subject: [PATCH] Fix deadlock while quiting VLC. It can get stuck in the playlist. Stopping the playlist first resolves this problem. --- modules/control/hotkeys.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index 0387d4e049..3c79603689 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -1,7 +1,7 @@ /***************************************************************************** * hotkeys.c: Hotkey handling for vlc ***************************************************************************** - * Copyright (C) 2004 VideoLAN + * Copyright (C) 2005 VideoLAN * $Id$ * * Authors: Sigmund Augdal @@ -253,6 +253,14 @@ static void Run( intf_thread_t *p_intf ) if( i_action == ACTIONID_QUIT ) { + p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + if( p_playlist ) + { + playlist_Stop( p_playlist ); + vlc_object_release( p_playlist ); + } + /* Playlist is stopped now kill vlc. */ p_intf->p_vlc->b_die = VLC_TRUE; ClearChannels( p_intf, p_vout ); vout_OSDMessage( p_intf, DEFAULT_CHAN, _( "Quit" ) ); -- 2.39.2