[vlc-commits] Qt: make the extensionsManager also available for qt4 as a dialog provider.

[Erwan Tulou]

vlc | branch: master | Erwan Tulou <erwan10 at videolan.org> | Sat May 18 15:39:27 2013 +0200| [2b417691138f1dff18c0a31f66c50b6cb5add8dd] | committer: Erwan Tulou

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2b417691138f1dff18c0a31f66c50b6cb5add8dd
---

 modules/gui/qt4/main_interface.cpp |    4 ----
 modules/gui/qt4/qt4.cpp            |    4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 2f2ca1a..ad91653 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -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;
 
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 9ed8de6..c8a545d 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -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