Embedded video still crashes, so disable it - refs #2136.

This is a VLC bug, not Qt4 version dependent.

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index ea6adf8944c6dc4a01be53638afd8c881d90c080..193a3baa2a97d28ba92f6cd128084caa27f9b1ab 100755 (executable)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -225,7 +225,7 @@ vlc_module_begin();
 
         set_callbacks( OpenDialogs, Close );
 
-#if !defined (Q_WS_X11) || HAS_QT43
+#if !defined (Q_WS_X11) /*|| HAS_QT43*/
     add_submodule();
         set_capability( "vout window", 50 );
         set_callbacks( WindowOpen, WindowClose );
@@ -455,8 +455,9 @@ static void *Thread( void *obj )
         /* Destroy first the main interface because it is connected to some
            slots in the MainInputManager */
         /* Destroy under the iface lock to sync vout QPointer */
-        delete p_mi;
     }
+    msleep( CLOCK_FREQ );
+        delete p_mi;
 
     /* Destroy all remaining windows,
        because some are connected to some slots
@@ -518,7 +519,9 @@ static int WindowOpen (vlc_object_t *obj)
     vout_window_t *wnd = (vout_window_t *)obj;
     QPointer<MainInterface> *miP;
 
+#if 1
     if (config_GetInt (obj, "embedded-video") <= 0)
+#endif
         return VLC_EGENERIC;
 
     intf_thread_t *intf = (intf_thread_t *)