diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:50:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:50:24 +0200 |
| commit | 127e5d5a79bc6de259f1fa4ba6a069d49a8f7a43 (patch) | |
| tree | c854e161db139b8aa963ea6be3dca88d7cf7058a /src/client/qwaylanddisplay.cpp | |
| parent | c6dc4f473518d4a739445a66858115309507797e (diff) | |
| parent | 9d408649458a274864ae2e7c2d67b4fa3cabbfcd (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ib3c5bec85a09d92e37a3af8e1c749a80cb40c056
Diffstat (limited to 'src/client/qwaylanddisplay.cpp')
| -rw-r--r-- | src/client/qwaylanddisplay.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index 2d1c81a75..dbb8e12dd 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -201,6 +201,8 @@ void QWaylandDisplay::blockingReadEvents() void QWaylandDisplay::exitWithError() { + mEventThread->quit(); + mEventThread->wait(); ::exit(1); } |