1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cocoa GL context: do not crash when closing windows

Browse Source 
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>
This commit is contained in:
Laszlo Agocs 2012-08-31 16:29:11 +03:00 committed by The Qt Project
parent 4b664eef64
commit aac24582c6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/cocoa/qcocoaglcontext.mm
View File

@ -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();