vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Tue Feb 6 11:12:18 2018 +0100| [c0d32728ebe033eb5c0487cb2e8a61fdf770f4bc] | committer: Hugo Beauzée-Luyssen
qt: actions_manager: Don't clear the list of renderers when stopping scan > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c0d32728ebe033eb5c0487cb2e8a61fdf770f4bc --- modules/gui/qt/actions_manager.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/gui/qt/actions_manager.cpp b/modules/gui/qt/actions_manager.cpp index b219eb0759..e614e424d0 100644 --- a/modules/gui/qt/actions_manager.cpp +++ b/modules/gui/qt/actions_manager.cpp @@ -53,6 +53,15 @@ ActionsManager::ActionsManager( intf_thread_t * _p_i ) ActionsManager::~ActionsManager() { StopRendererScan(); + /* reset the list of renderers */ + foreach (QAction* action, VLCMenuBar::rendererMenu->actions()) + { + QVariant data = action->data(); + if (!data.canConvert<QVariantHash>()) + continue; + VLCMenuBar::rendererMenu->removeAction(action); + VLCMenuBar::rendererGroup->removeAction(action); + } } void ActionsManager::doAction( int id_action ) @@ -344,15 +353,6 @@ void ActionsManager::RendererMenuCountdown() void ActionsManager::StopRendererScan() { - /* reset the list of renderers */ - foreach (QAction* action, VLCMenuBar::rendererMenu->actions()) - { - QVariant data = action->data(); - if (!data.canConvert<QVariantHash>()) - continue; - VLCMenuBar::rendererMenu->removeAction(action); - VLCMenuBar::rendererGroup->removeAction(action); - } foreach ( vlc_renderer_discovery_t* p_rd, m_rds ) vlc_rd_release( p_rd ); m_rds.clear(); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
