Commit 0d5db2b4 authored by Olivier Teulière's avatar Olivier Teulière

Fixed exiting skins when there is no video.

Exiting still hangs if there is a video output.
parent df952aec
...@@ -22,6 +22,13 @@ ...@@ -22,6 +22,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_osd.h>
#include <vlc_playlist.h>
#include "cmd_quit.hpp" #include "cmd_quit.hpp"
#include "../src/os_factory.hpp" #include "../src/os_factory.hpp"
#include "../src/os_loop.hpp" #include "../src/os_loop.hpp"
...@@ -29,9 +36,16 @@ ...@@ -29,9 +36,16 @@
void CmdQuit::execute() void CmdQuit::execute()
{ {
// Stop the playlist
vout_OSDMessage( getIntf(), DEFAULT_CHAN, _( "Quit" ) );
playlist_Stop( getIntf()->p_sys->p_playlist );
// Get the instance of OSFactory // Get the instance of OSFactory
OSFactory *pOsFactory = OSFactory::instance( getIntf() ); OSFactory *pOsFactory = OSFactory::instance( getIntf() );
// Exit the main OS loop // Exit the main OS loop
pOsFactory->getOSLoop()->exit(); pOsFactory->getOSLoop()->exit();
// Kill libvlc
vlc_object_kill( getIntf()->p_libvlc );
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment