From kde-commits Wed Mar 31 21:27:29 2010 From: Marco Martin Date: Wed, 31 Mar 2010 21:27:29 +0000 To: kde-commits Subject: KDE/kdebase/workspace/plasma/netbook/shell Message-Id: <20100331212729.D9193AC888 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=127007077131490 SVN commit 1109720 by mart: if it wasn't saved in plasmarc, lok in plasma-appletsrc what is the containment that got the screen M +3 -2 plasmaapp.cpp --- trunk/KDE/kdebase/workspace/plasma/netbook/shell/plasmaapp.cpp #1109719:1109720 @@ -573,13 +573,14 @@ int id = viewIds.readEntry(QString::number(containment->id()), defaultId); - kDebug() << "new containment" << (QObject*)containment << containment->id()<<"view id"<id() << "view id" << id; + //is it a desktop -and- is it active? if ((m_mainView && id == NetView::mainViewId()) || (containment->containmentType() != Plasma::Containment::PanelContainment && containment->containmentType() != Plasma::Containment::CustomPanelContainment && - !viewIds.exists() && m_mainView->containment() == 0)) { + !viewIds.exists() && containment->screen() == 0)) { m_mainView->setContainment(containment); containment->setScreen(0); //is it a panel?