[726/906] window: don't call a NULL destroy function
authorMatthew Waters <ystreet00@gmail.com>
Tue, 2 Jul 2013 12:45:08 +0000 (22:45 +1000)
committerTim-Philipp Müller <tim@centricular.com>
Sat, 9 Dec 2017 19:31:29 +0000 (19:31 +0000)
gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
gst-libs/gst/gl/win32/gstglwindow_win32.c

index 2c3cb3e..497416b 100755 (executable)
@@ -772,8 +772,9 @@ gst_gl_window_cocoa_get_gl_api (GstGLWindow * window)
   NSAutoreleasePool *pool;
 
   m_cocoa->priv->running = FALSE;
-  m_callback (m_data);
+  if (m_callback)
+    m_callback (m_data);
+
 #ifdef GNUSTEP
   pool = [[NSAutoreleasePool alloc] init];
   if ([NSApp isRunning])
index 35735b9..0fdf31c 100644 (file)
@@ -525,7 +525,8 @@ window_proc (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
         GST_DEBUG ("WM_GST_GL_WINDOW_QUIT\n");
 
-        destroy_cb ((gpointer) wParam);
+        if (destroy_cb)
+          destroy_cb ((gpointer) wParam);
 
         parent_id = GetProp (hWnd, "gl_window_parent_id");
         if (parent_id) {