vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[wayland] Don't use waitForFinished on the Xwayland QProcess 

WaitForFinished blocks our main thread, but Xwayland wants to talk
to Wayland and blocks as well. So let's ensure events are processed
while terminating Xwayland.
icc-effect-5.14.5
Martin Gräßlin 2015-11-12 15:15:44 +01:00
parent 240e7ba337
commit f6ef9e8d8c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autotests/wayland/kwin_wayland_test.cpp
View File

@ -68,7 +68,9 @@ WaylandTestApplication::~WaylandTestApplication()
}
if (m_xwaylandProcess) {
m_xwaylandProcess->terminate();
m_xwaylandProcess->waitForFinished();
while (m_xwaylandProcess->state() != QProcess::NotRunning) {
processEvents(QEventLoop::WaitForMoreEvents);
}
waylandServer()->destroyXWaylandConnection();
}
waylandServer()->destroyInternalConnection();

4
main_wayland.cpp
View File

@ -92,7 +92,9 @@ ApplicationWayland::~ApplicationWayland()
}
if (m_xwaylandProcess) {
m_xwaylandProcess->terminate();
m_xwaylandProcess->waitForFinished();
while (m_xwaylandProcess->state() != QProcess::NotRunning) {
processEvents(QEventLoop::WaitForMoreEvents);
}
waylandServer()->destroyXWaylandConnection();
}
waylandServer()->destroyInternalConnection();