Commit 795654cd authored by Gildas Bazin's avatar Gildas Bazin

* modules/gui/skins2/src/dialogs.cpp: the dialogs provider needs to be of VLC_OBJECT_DIALOGS type.

* modules/gui/skins2/src/vlcproc.cpp: honour p_intf->b_die.
parent 8c4fc701
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dialogs.cpp * dialogs.cpp
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * Copyright (C) 2003 VideoLAN
* $Id: dialogs.cpp,v 1.3 2004/03/03 20:39:52 gbazin Exp $ * $Id$
* *
* Authors: Cyril Deguet <asmax@via.ecp.fr> * Authors: Cyril Deguet <asmax@via.ecp.fr>
* Olivier Teulire <ipkiss@via.ecp.fr> * Olivier Teulire <ipkiss@via.ecp.fr>
...@@ -125,7 +125,7 @@ bool Dialogs::init() ...@@ -125,7 +125,7 @@ bool Dialogs::init()
{ {
// Allocate descriptor // Allocate descriptor
m_pProvider = (intf_thread_t *)vlc_object_create( getIntf(), m_pProvider = (intf_thread_t *)vlc_object_create( getIntf(),
VLC_OBJECT_INTF ); VLC_OBJECT_DIALOGS );
if( m_pProvider == NULL ) if( m_pProvider == NULL )
{ {
msg_Err( getIntf(), "out of memory" ); msg_Err( getIntf(), "out of memory" );
......
...@@ -115,7 +115,7 @@ VlcProc::~VlcProc() ...@@ -115,7 +115,7 @@ VlcProc::~VlcProc()
void VlcProc::manage() void VlcProc::manage()
{ {
// Did the user requested to quit vlc ? // Did the user requested to quit vlc ?
if( getIntf()->p_vlc->b_die ) if( getIntf()->b_die || getIntf()->p_vlc->b_die )
{ {
CmdQuit *pCmd = new CmdQuit( getIntf() ); CmdQuit *pCmd = new CmdQuit( getIntf() );
AsyncQueue *pQueue = AsyncQueue::instance( getIntf() ); AsyncQueue *pQueue = AsyncQueue::instance( getIntf() );
......
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