Qt4: Remove hackish use of vout window for the FS controller.

This fixes #1651. We can hopefully get a proper patch for the FS
controller.

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 41bdd26d395d6065b0b619c5af880a3a9466daf3..ae004801e18811e48d2b5270f623a4bc9efd856e 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -467,6 +467,9 @@ static int WindowOpen (vlc_object_t *obj)
 {
     vout_window_t *wnd = (vout_window_t *)obj;
 
+    if (config_GetInt (obj, "embedded-video") <= 0)
+        return VLC_EGENERIC;
+
     intf_thread_t *intf = (intf_thread_t *)
         vlc_object_find_name (obj, "qt4", FIND_ANYWHERE);
     if (intf == NULL)
@@ -495,12 +498,6 @@ static int WindowOpen (vlc_object_t *obj)
     if (miP->isNull ())
         return VLC_EGENERIC;
 
-    if (config_GetInt (obj, "embedded-video") <= 0)
-    {
-        (*miP)->requestNotEmbeddedVideo (wnd->vout);
-        return VLC_EGENERIC;
-    }
-
     wnd->handle = (*miP)->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
                                         &wnd->width, &wnd->height);
     windowLock.unlock ();