AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not disconnect with nullptr when unplugging screens

Browse Source 
Task-number: QTBUG-42803
Change-Id: I080ec3f0cc2cb55b43a9b8792f03b002b2e0f982
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
This commit is contained in:
Laszlo Agocs 2016-03-30 07:32:51 +02:00
parent 4faadb3ad3
commit 41a0be329c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/kernel/qopenglcontext.cpp
View File

@ -510,8 +510,10 @@ void QOpenGLContext::setScreen(QScreen *screen)
void QOpenGLContextPrivate::_q_screenDestroyed(QObject *object) void QOpenGLContextPrivate::_q_screenDestroyed(QObject *object)
{ {
Q_Q(QOpenGLContext); Q_Q(QOpenGLContext);
if (object == static_cast<QObject *>(screen)) if (object == static_cast<QObject *>(screen)) {
screen = 0;
q->setScreen(0); q->setScreen(0);
}
} }
/*! /*!