Don't store virtual desktop settings while loading them

fwd-port of a2d4c3ebdf7137f3543c88245f0bfd3dba308ebf
CCBUG: 272666
This commit is contained in:
Thomas Lübking 2011-05-08 17:14:45 +02:00
parent ff889337e2
commit 2534acc961

View file

@ -1173,8 +1173,10 @@ void Workspace::slotReinitCompositing()
}
}
static bool _loading_desktop_settings = false;
void Workspace::loadDesktopSettings()
{
_loading_desktop_settings = true;
KSharedConfig::Ptr c = KGlobal::config();
QString groupname;
if (screen_number == 0)
@ -1189,10 +1191,13 @@ void Workspace::loadDesktopSettings()
rootInfo->setDesktopName(i, s.toUtf8().data());
desktop_focus_chain[i-1] = i;
}
_loading_desktop_settings = false;
}
void Workspace::saveDesktopSettings()
{
if (_loading_desktop_settings)
return;
KSharedConfig::Ptr c = KGlobal::config();
QString groupname;
if (screen_number == 0)