diff options
| author | Michal Srb <msrb@suse.com> | 2017-11-27 09:59:01 +0100 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-01-24 16:27:31 -0500 |
| commit | 71348e99a8e6a95542e483b93839168ca8f51f81 (patch) | |
| tree | 65f3b1f88ade8ff6cad649e8d2a52d9488592af9 /os | |
| parent | d5c23b29487d5ff440abf5ed0beb22c00f21e387 (diff) | |
os/inputthread: Force unlock when stopping thread.
The inputthread is kept locked all the time while X server's VT is not active.
If the X server is terminated while not active, it will be stuck forever in
InputThreadFini waiting for the thread to join, but it wouldn't because it is
locked.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=103782
Signed-off-by: Michal Srb <msrb@suse.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'os')
| -rw-r--r-- | os/inputthread.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/os/inputthread.c b/os/inputthread.c index e7159c70a..97e59d21f 100644 --- a/os/inputthread.c +++ b/os/inputthread.c @@ -499,6 +499,7 @@ InputThreadFini(void) /* Close the pipe to get the input thread to shut down */ close(hotplugPipeWrite); + input_force_unlock(); pthread_join(inputThreadInfo->thread, NULL); xorg_list_for_each_entry_safe(dev, next, &inputThreadInfo->devs, node) { |