Cocoa GL context: do not crash when closing windows

Running hellowindow and closing its windows one by one would result
in crashes without the additional checks for the presence of the
underlying native window.

Change-Id: Id32bdfda9a77936380b2e9a95fb56ceb52028d9d
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm
index 0292e02..4dd1962 100644 (file)
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm
@@ -103,7 +103,7 @@ void QCocoaGLContext::setActiveWindow(QWindow *window)
     if (window == m_currentWindow.data())
         return;
 
-    if (m_currentWindow)
+    if (m_currentWindow && m_currentWindow.data()->handle())
         static_cast<QCocoaWindow *>(m_currentWindow.data()->handle())->setCurrentContext(0);
 
     Q_ASSERT(window->handle());
@@ -119,7 +119,7 @@ void QCocoaGLContext::setActiveWindow(QWindow *window)
 
 void QCocoaGLContext::doneCurrent()
 {
-    if (m_currentWindow)
+    if (m_currentWindow && m_currentWindow.data()->handle())
         static_cast<QCocoaWindow *>(m_currentWindow.data()->handle())->setCurrentContext(0);
 
     m_currentWindow.clear();