]> git.sesse.net Git - vlc/commitdiff
Dialogs:destroy move from the Close function, because it prevents skins2 normal clean...
authorErwan Tulou <brezhoneg1@yahoo.fr>
Mon, 2 Mar 2009 16:05:09 +0000 (17:05 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 3 Mar 2009 08:09:54 +0000 (09:09 +0100)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/gui/skins2/src/skin_main.cpp

index be5bb554726d52ebc0447251fd585ce9deb2e3ac..9590e777603cd16181fe30095db93aa96ce4a533 100644 (file)
@@ -244,7 +244,7 @@ static void Close( vlc_object_t *p_this )
     // Destroy "singleton" objects
     OSFactory::instance( p_intf )->destroyOSLoop();
     ThemeRepository::destroy( p_intf );
-    Dialogs::destroy( p_intf );
+    //Dialogs::destroy( p_intf );
     Interpreter::destroy( p_intf );
     AsyncQueue::destroy( p_intf );
     VarManager::destroy( p_intf );
@@ -286,6 +286,10 @@ static void Run( intf_thread_t *p_intf )
         delete p_intf->p_sys->p_theme;
         p_intf->p_sys->p_theme = NULL;
     }
+
+    // cannot be called in "Close", because it refcounts skins2
+    Dialogs::destroy( p_intf );
+
     vlc_restorecancel(canc);
 }