Commit e7c5d1e3 authored by gbazin's avatar gbazin
Browse files

* src/skin_main.cpp: fixed bug related to the destruction order.

* parser/xmlparser.hpp: removed useless change.
parent 36fb9ee6
......@@ -2,7 +2,7 @@
* xmlparser.hpp
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id: xmlparser.hpp,v 1.4 2004/02/27 13:24:12 gbazin Exp $
* $Id: xmlparser.hpp,v 1.5 2004/02/27 15:07:04 gbazin Exp $
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
*
......@@ -51,8 +51,8 @@ class XMLParser: public SkinObject
typedef map<const char*, const char*, ltstr> AttrList_t;
/// Callbacks
virtual void handleBeginElement( const string &rName, AttrList_t &attr ) {;}
virtual void handleEndElement( const string &rName ) {;}
virtual void handleBeginElement( const string &rName, AttrList_t &attr ) {}
virtual void handleEndElement( const string &rName ) {}
private:
/// Reader context
......
......@@ -2,7 +2,7 @@
* skin_main.cpp
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: skin_main.cpp,v 1.6 2004/02/08 11:23:17 gbazin Exp $
* $Id: skin_main.cpp,v 1.7 2004/02/27 15:07:04 gbazin Exp $
*
* Authors: Cyril Deguet <asmax@via.ecp.fr>
* Olivier Teulire <ipkiss@via.ecp.fr>
......@@ -133,13 +133,13 @@ static void Close( vlc_object_t *p_this )
intf_thread_t *p_intf = (intf_thread_t *)p_this;
// Destroy "singleton" objects
VlcProc::destroy( p_intf );
OSFactory::instance( p_intf )->destroyOSLoop();
OSFactory::destroy( p_intf );
Dialogs::destroy( p_intf );
Interpreter::destroy( p_intf );
AsyncQueue::destroy( p_intf );
VarManager::destroy( p_intf );
VlcProc::destroy( p_intf );
if( p_intf->p_sys->p_input )
{
......
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