From 15d4de4b4acd602c476494ead1bb87686fd41a85 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Fri, 13 Sep 2013 14:50:05 +0200
Subject: [PATCH] correctly load panels when the shell gets switched

---
 src/shell/shellcorona.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/shell/shellcorona.cpp b/src/shell/shellcorona.cpp
index 08283fd46..c9b534d28 100644
--- a/src/shell/shellcorona.cpp
+++ b/src/shell/shellcorona.cpp
@@ -364,6 +364,7 @@ void ShellCorona::updateScreenOwner(int wasScreen, int isScreen, Plasma::Contain
     } else {
 
         if (containment->isUiReady()) {
+            d->loadingDesktops.remove(containment);
             checkLoadingDesktopsComplete();
         } else {
             d->loadingDesktops.insert(containment);
@@ -384,6 +385,9 @@ void ShellCorona::handleContainmentAdded(Plasma::Containment* c)
 {
     connect(c, &Plasma::Containment::showAddWidgetsInterface,
             this, &ShellCorona::showWidgetExplorer);
+    connect(c, &QObject::destroyed, [=] (QObject *o) {
+        d->loadingDesktops.remove(static_cast<Plasma::Containment *>(o));
+    });
 }
 
 void ShellCorona::showWidgetExplorer()