summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/display.cpp4
-rw-r--r--src/screen.cpp3
-rw-r--r--src/window.cpp3
3 files changed, 4 insertions, 6 deletions
diff --git a/src/display.cpp b/src/display.cpp
index 214f75b..f837366 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -811,11 +811,11 @@ CompDisplay::init (const char *name)
priv->returnKeyCode =
XKeysymToKeycode (priv->dpy, XStringToKeysym ("Return"));
- core->addChild (this);
-
/* TODO: bailout properly when objectInitPlugins fails */
assert (CompPlugin::objectInitPlugins (this));
+ core->addChild (this);
+
if (onlyCurrentScreen)
{
firstScreen = DefaultScreen (priv->dpy);
diff --git a/src/screen.cpp b/src/screen.cpp
index 1f039c1..85a0a4a 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -1215,11 +1215,10 @@ CompScreen::init (CompDisplay *display,
priv->getDesktopHints ();
- display->addChild (this);
-
/* TODO: bailout properly when objectInitPlugins fails */
assert (CompPlugin::objectInitPlugins (this));
+ display->addChild (this);
XQueryTree (dpy, priv->root,
diff --git a/src/window.cpp b/src/window.cpp
index 558ec8e..350aeb1 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -4644,11 +4644,10 @@ CompWindow::CompWindow (CompScreen *screen,
}
}
- screen->addChild (this);
-
/* TODO: bailout properly when objectInitPlugins fails */
assert (CompPlugin::objectInitPlugins (this));
+ screen->addChild (this);
recalcActions ();
updateIconGeometry ();