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

* parser/xmlparser.hpp: removed useless change.

diff --git a/modules/gui/skins2/parser/xmlparser.hpp b/modules/gui/skins2/parser/xmlparser.hpp
index cdfd78e252379eae8e6269fe3c156afcedae3209..5c3c00e5f8dcbd5028438a870c2c92a06e22900e 100644 (file)
--- a/modules/gui/skins2/parser/xmlparser.hpp
+++ b/modules/gui/skins2/parser/xmlparser.hpp
@@ -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

diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp
index 09fcabeef4cd6fd3cf30112b96b6845fa17056eb..371805a57881e2e877c87957eb03eca236e9ca08 100644 (file)
--- a/modules/gui/skins2/src/skin_main.cpp
+++ b/modules/gui/skins2/src/skin_main.cpp
@@ -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 Teulière <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 )
     {