Commit 66f8f41b authored by Erwan Tulou's avatar Erwan Tulou Committed by Jean-Baptiste Kempf

Dialogs:destroy move from the Close function, because it prevents skins2...

Dialogs:destroy move from the Close function, because it prevents skins2 normal cleanup (Close function is never called because refcount remains > 1)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 657bd315
...@@ -244,7 +244,7 @@ static void Close( vlc_object_t *p_this ) ...@@ -244,7 +244,7 @@ static void Close( vlc_object_t *p_this )
// Destroy "singleton" objects // Destroy "singleton" objects
OSFactory::instance( p_intf )->destroyOSLoop(); OSFactory::instance( p_intf )->destroyOSLoop();
ThemeRepository::destroy( p_intf ); ThemeRepository::destroy( p_intf );
Dialogs::destroy( p_intf ); //Dialogs::destroy( p_intf );
Interpreter::destroy( p_intf ); Interpreter::destroy( p_intf );
AsyncQueue::destroy( p_intf ); AsyncQueue::destroy( p_intf );
VarManager::destroy( p_intf ); VarManager::destroy( p_intf );
...@@ -286,6 +286,10 @@ static void Run( intf_thread_t *p_intf ) ...@@ -286,6 +286,10 @@ static void Run( intf_thread_t *p_intf )
delete p_intf->p_sys->p_theme; delete p_intf->p_sys->p_theme;
p_intf->p_sys->p_theme = NULL; p_intf->p_sys->p_theme = NULL;
} }
// cannot be called in "Close", because it refcounts skins2
Dialogs::destroy( p_intf );
vlc_restorecancel(canc); vlc_restorecancel(canc);
} }
......
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