Qt4 - revert the revertion :D

Jokes besides, if ~MainInterface() is called, then p_mi is destroyed, and p_sys->p_mi too. I just hope I am not wrong :D

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 34d63a31de6734983a877aa948192754e3d1c1a1..de9f8e2f1e32bbf860c3ee2095a2bd277871c31b 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -352,6 +352,7 @@ MainInterface::~MainInterface()
     p_intf->pf_request_window = NULL;
     p_intf->pf_release_window = NULL;
     p_intf->pf_control_window = NULL;
+    p_intf->p_sys->p_mi = NULL;
 }
 
 /*****************************

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 1f7e4fe55b480e2c487879afb12cd76fbe5533e8..3f6c666dd85c093765bd15702f413f6f233b8c92 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -320,7 +320,6 @@ static void Init( intf_thread_t *p_intf )
     /* And quit */
     MainInputManager::killInstance();
     DialogsProvider::killInstance();
-    delete p_intf->p_sys->p_mi;
     delete app;
 }