[vlc-commits] vout:win32: the parent vout_window_t cannot be NULL

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Mar 29 15:00:09 2019 +0100| [e4fad0e4728c8a337831e4009d822f25a50b6d3c] | committer: Steve Lhomme

vout:win32: the parent vout_window_t cannot be NULL

It may be a dummy with no HWND though.

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

 modules/video_output/win32/events.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/win32/events.c b/modules/video_output/win32/events.c
index c4fa3b8f1d..6611951b4e 100644
--- a/modules/video_output/win32/events.c
+++ b/modules/video_output/win32/events.c
@@ -636,7 +636,10 @@ static int Win32VoutCreateWindow( event_thread_t *p_event )
     hInstance = GetModuleHandle(NULL);
 
     /* If an external window was specified, we'll draw in it. */
-    p_event->hparent = p_event->parent_window->handle.hwnd;
+    if ( p_event->parent_window->type == VOUT_WINDOW_TYPE_HWND )
+        p_event->hparent = p_event->parent_window->handle.hwnd;
+    else
+        p_event->hparent = NULL;
     p_event->cursor_arrow = LoadCursor(NULL, IDC_ARROW);
     p_event->cursor_empty = EmptyCursor(hInstance);