diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-03-30 07:32:51 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-05 09:43:14 +0000 |
| commit | 41a0be329c3f31345afc61b622e49fc4bc3bce08 (patch) | |
| tree | 6965b9a6ac0f5c7aa53209e1d6a195cbd9079cb5 /src/gui/kernel/qopenglcontext.cpp | |
| parent | 4faadb3ad351b1654902ba9564df9789f727621e (diff) | |
Do not disconnect with nullptr when unplugging screens
Task-number: QTBUG-42803
Change-Id: I080ec3f0cc2cb55b43a9b8792f03b002b2e0f982
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Diffstat (limited to 'src/gui/kernel/qopenglcontext.cpp')
| -rw-r--r-- | src/gui/kernel/qopenglcontext.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qopenglcontext.cpp b/src/gui/kernel/qopenglcontext.cpp index 3c033ea39e..7588c36c9b 100644 --- a/src/gui/kernel/qopenglcontext.cpp +++ b/src/gui/kernel/qopenglcontext.cpp @@ -510,8 +510,10 @@ void QOpenGLContext::setScreen(QScreen *screen) void QOpenGLContextPrivate::_q_screenDestroyed(QObject *object) { Q_Q(QOpenGLContext); - if (object == static_cast<QObject *>(screen)) + if (object == static_cast<QObject *>(screen)) { + screen = 0; q->setScreen(0); + } } /*! |