yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move Screens::create post global config reading

Browse source 
It calls KConfigGroup what is not thread safe and
collides with threaded config reading.

BUG: 321164
FIXED-IN: 4.11
REVIEW: 111082
This commit is contained in:
Thomas Lübking 2013-06-16 13:56:28 +02:00
parent 936b63dc1a
commit 3f69a5d09b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
workspace.cpp
View file

@ -154,10 +154,6 @@ Workspace::Workspace(bool restore)
// start the cursor support // start the cursor support
Cursor::create(this); Cursor::create(this);
// get screen support
Screens *screens = Screens::create(this);
connect(screens, SIGNAL(changed()), SLOT(desktopResized()));
#ifdef KWIN_BUILD_ACTIVITIES #ifdef KWIN_BUILD_ACTIVITIES
Activities *activities = Activities::create(this); Activities *activities = Activities::create(this);
connect(activities, SIGNAL(currentChanged(QString)), SLOT(updateCurrentActivity(QString))); connect(activities, SIGNAL(currentChanged(QString)), SLOT(updateCurrentActivity(QString)));
@ -165,6 +161,11 @@ Workspace::Workspace(bool restore)
// PluginMgr needs access to the config file, so we need to wait for it for finishing // PluginMgr needs access to the config file, so we need to wait for it for finishing
reparseConfigFuture.waitForFinished(); reparseConfigFuture.waitForFinished();
// get screen support
Screens *screens = Screens::create(this);
connect(screens, SIGNAL(changed()), SLOT(desktopResized()));
options->loadConfig(); options->loadConfig();
options->loadCompositingConfig(false); options->loadCompositingConfig(false);
DecorationPlugin::create(this); DecorationPlugin::create(this);