From 37bc5cdd0e31fd9c8712c0bd88039dd474be4418 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 12 Apr 2015 23:05:48 -0500 Subject: Fix long-standing inverted signal mask in kdesktop_lock initial sigsuspend Prevent helper thread termination signal from errantly being handled by main thread --- kdesktop/lock/lockprocess.cc | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'kdesktop/lock/lockprocess.cc') diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index da12bd46c..a4a2badd3 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -2842,6 +2842,13 @@ void ControlPipeHandlerObject::run(void) { mThreadID = pthread_self(); mRunning = true; + sigset_t new_mask; + sigemptyset(&new_mask); + sigaddset(&new_mask, SIGUSR1); + + // Unblock SIGUSR1 + pthread_sigmask(SIG_UNBLOCK, &new_mask, NULL); + int display_number = atoi(TQString(XDisplayString(tqt_xdisplay())).replace(":","").ascii()); if (display_number < 0) { -- cgit v1.2.1