From 41a0be329c3f31345afc61b622e49fc4bc3bce08 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Date: Wed, 30 Mar 2016 07:32:51 +0200
Subject: 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>
---
 src/gui/kernel/qopenglcontext.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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);
+    }
 }
 
 /*!
-- 
cgit v1.2.3