Remove redundant initializeX11() in Compositor
Compositor::setupStart() already calls initializeX11(). This fixes BadAccess warning on startup. CCBUG: 455167
This commit is contained in:
parent
1e62fe99bd
commit
634e032201
1 changed files with 3 additions and 6 deletions
|
@ -159,6 +159,9 @@ Compositor::Compositor(QObject *workspace)
|
|||
},
|
||||
Qt::QueuedConnection);
|
||||
|
||||
connect(kwinApp(), &Application::x11ConnectionChanged, this, &Compositor::initializeX11);
|
||||
connect(kwinApp(), &Application::x11ConnectionAboutToBeDestroyed, this, &Compositor::cleanupX11);
|
||||
|
||||
// register DBus
|
||||
new CompositorDBusInterface(this);
|
||||
FTraceLogger::create();
|
||||
|
@ -358,12 +361,6 @@ void Compositor::cleanupX11()
|
|||
|
||||
void Compositor::startupWithWorkspace()
|
||||
{
|
||||
connect(kwinApp(), &Application::x11ConnectionChanged,
|
||||
this, &Compositor::initializeX11, Qt::UniqueConnection);
|
||||
connect(kwinApp(), &Application::x11ConnectionAboutToBeDestroyed,
|
||||
this, &Compositor::cleanupX11, Qt::UniqueConnection);
|
||||
initializeX11();
|
||||
|
||||
Q_ASSERT(m_scene);
|
||||
m_scene->initialize();
|
||||
|
||||
|
|
Loading…
Reference in a new issue