[vlc-devel] commit: Fixed video request when the qt4 embedded slot is already taken. ( Laurent Aimar )

git version control git at videolan.org
Mon Aug 4 20:29:21 CEST 2008


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Aug  4 20:31:18 2008 +0200| [cc09f50a47627df0c3fbf92d9ffd0a8329edf81b] | committer: Laurent Aimar 

Fixed video request when the qt4 embedded slot is already taken.

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

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

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index efd46d6..e5d3e28 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -518,6 +518,10 @@ static int WindowOpen (vlc_object_t *obj)
     wnd->handle = (*miP)->requestVideo (wnd->vout, &wnd->pos_x, &wnd->pos_y,
                                         &wnd->width, &wnd->height);
     windowLock.unlock ();
+
+    if (!wnd->handle)
+        return VLC_EGENERIC;
+
     wnd->control = WindowControl;
     wnd->p_private = miP;
     return VLC_SUCCESS;




More information about the vlc-devel mailing list