Commit 2b417691 authored by Erwan Tulou's avatar Erwan Tulou

Qt: make the extensionsManager also available for qt4 as a dialog provider.

parent f9ec3543
......@@ -32,7 +32,6 @@
#include "main_interface.hpp"
#include "input_manager.hpp" // Creation
#include "actions_manager.hpp" // killInstance
#include "extensions_manager.hpp" // killInstance
#include "util/customwidgets.hpp" // qtEventToVLCKey, QVLCStackedWidget
#include "util/qt_dirs.hpp" // toNativeSeparators
......@@ -281,9 +280,6 @@ MainInterface::~MainInterface()
/* Be sure to kill the actionsManager... Only used in the MI and control */
ActionsManager::killInstance();
/* Idem */
ExtensionsManager::killInstance();
/* Delete the FSC controller */
delete fullscreenControls;
......
......@@ -35,6 +35,7 @@
#include "input_manager.hpp" /* THEMIM destruction */
#include "dialogs_provider.hpp" /* THEDP creation */
#include "main_interface.hpp" /* MainInterface creation */
#include "extensions_manager.hpp" /* Extensions manager */
#include "dialogs/help.hpp" /* Launch Update */
#include "recents.hpp" /* Recents Item destruction */
#include "util/qvlcapp.hpp" /* QVLCApplication definition */
......@@ -563,6 +564,9 @@ static void *Thread( void *obj )
delete p_mi;
}
/* */
ExtensionsManager::killInstance();
/* Destroy all remaining windows,
because some are connected to some slots
in the MainInputManager
......
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