Commit a94be708 authored by Méven Car's avatar Méven Car
Browse files

Merge branch 'Plasma/5.18'

parents 864f3558 e8a1f8ec
......@@ -101,7 +101,7 @@ void IdleInhibition::update(AbstractClient *client)
// TODO: Don't honor the idle inhibitor object if the shell client is not
// on the current activity (currently, activities are not supported).
const bool visible = client->isShown(true) && client->isOnCurrentDesktop();
if (visible && client->surface()->inhibitsIdle()) {
if (visible && client->surface() && client->surface()->inhibitsIdle()) {
inhibit(client);
} else {
uninhibit(client);
......
......@@ -80,12 +80,17 @@ void DrmOutput::teardown()
}
m_primaryPlane->setCurrent(nullptr);
}
if (m_cursorPlane) {
m_cursorPlane->setOutput(nullptr);
}
m_crtc->setOutput(nullptr);
m_conn->setOutput(nullptr);
delete m_cursor[0];
m_cursor[0] = nullptr;
delete m_cursor[1];
m_cursor[1] = nullptr;
if (!m_pageFlipPending) {
deleteLater();
} //else will be deleted in the page flip handler
......
......@@ -637,7 +637,7 @@ void WaylandServer::createInternalConnection()
connect(m_internalConnection.client, &ConnectionThread::connected, this,
[this] {
Registry *registry = new Registry(this);
EventQueue *eventQueue = new EventQueue(this);
EventQueue *eventQueue = new EventQueue(registry);
eventQueue->setup(m_internalConnection.client);
registry->setEventQueue(eventQueue);
registry->create(m_internalConnection.client);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment