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

Merge branch 'Plasma/5.18'

Browse source
This commit is contained in:
Méven Car 2020-04-17 18:31:23 +02:00
commit a94be708ef
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
idle_inhibition.cpp
View file

@ -101,7 +101,7 @@ void IdleInhibition::update(AbstractClient *client)
// TODO: Don't honor the idle inhibitor object if the shell client is not // TODO: Don't honor the idle inhibitor object if the shell client is not
// on the current activity (currently, activities are not supported). // on the current activity (currently, activities are not supported).
const bool visible = client->isShown(true) && client->isOnCurrentDesktop(); const bool visible = client->isShown(true) && client->isOnCurrentDesktop();
if (visible && client->surface()->inhibitsIdle()) { if (visible && client->surface() && client->surface()->inhibitsIdle()) {
inhibit(client); inhibit(client);
} else { } else {
uninhibit(client); uninhibit(client);

5
plugins/platforms/drm/drm_output.cpp
View file

@ -80,12 +80,17 @@ void DrmOutput::teardown()
} }
m_primaryPlane->setCurrent(nullptr); m_primaryPlane->setCurrent(nullptr);
} }
if (m_cursorPlane) {
m_cursorPlane->setOutput(nullptr);
}
m_crtc->setOutput(nullptr); m_crtc->setOutput(nullptr);
m_conn->setOutput(nullptr); m_conn->setOutput(nullptr);
delete m_cursor[0]; delete m_cursor[0];
m_cursor[0] = nullptr;
delete m_cursor[1]; delete m_cursor[1];
m_cursor[1] = nullptr;
if (!m_pageFlipPending) { if (!m_pageFlipPending) {
deleteLater(); deleteLater();
} //else will be deleted in the page flip handler } //else will be deleted in the page flip handler

2
wayland_server.cpp
View file

@ -637,7 +637,7 @@ void WaylandServer::createInternalConnection()
connect(m_internalConnection.client, &ConnectionThread::connected, this, connect(m_internalConnection.client, &ConnectionThread::connected, this,
[this] { [this] {
Registry *registry = new Registry(this); Registry *registry = new Registry(this);
EventQueue *eventQueue = new EventQueue(this); EventQueue *eventQueue = new EventQueue(registry);
eventQueue->setup(m_internalConnection.client); eventQueue->setup(m_internalConnection.client);
registry->setEventQueue(eventQueue); registry->setEventQueue(eventQueue);
registry->create(m_internalConnection.client); registry->create(m_internalConnection.client);