Destroy the QScreen when its wl_output is removed

Change-Id: I4532d05cca44c88fe38c14eacbe90c190f272b2c
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>

1 files changed, 11 insertions, 1 deletions

diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp
index 595d2ce77..a037bb962 100644
--- a/src/client/qwaylanddisplay.cpp
+++ b/src/client/qwaylanddisplay.cpp
@@ -262,7 +262,17 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin
 void QWaylandDisplay::registry_global_remove(uint32_t id)
 {
     for (int i = 0, ie = mGlobals.count(); i != ie; ++i) {
-        if (mGlobals[i].id == id) {
+        RegistryGlobal &global = mGlobals[i];
+        if (global.id == id) {
+            if (global.interface == QStringLiteral("wl_output")) {
+                foreach (QWaylandScreen *screen, mScreens) {
+                    if (screen->outputId() == id) {
+                        delete screen;
+                        mScreens.removeOne(screen);
+                        break;
+                    }
+                }
+            }
             mGlobals.removeAt(i);
             break;
         }