diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2015-04-12 22:29:58 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-04-14 02:27:26 +0200 |
| commit | 5d4afcb68fdff18aa9e44d1d111130cdb43e9ba4 (patch) | |
| tree | b21fd08b95b326fd66cd59b28022c5a02fa221af /kdesktop/lock/lockprocess.h | |
| parent | 1f266258df399ea64c10001b161a2fb209140b62 (diff) | |
| download | tdebase-5d4afcb68fdff18aa9e44d1d111130cdb43e9ba4.tar.gz tdebase-5d4afcb68fdff18aa9e44d1d111130cdb43e9ba4.zip | |
Remove call to pthread_cancel() in kdesktop_lock
This resolves a sporadic deadlock during kdesktop_lock termination
(cherry picked from commit e569dd46ac06ef5a5f2ad03a311640e1834c749f)
Diffstat (limited to 'kdesktop/lock/lockprocess.h')
| -rw-r--r-- | kdesktop/lock/lockprocess.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h index e063b9669..34e3da8e0 100644 --- a/kdesktop/lock/lockprocess.h +++ b/kdesktop/lock/lockprocess.h @@ -56,12 +56,18 @@ class ControlPipeHandlerObject : public TQObject public slots: void run(); + void terminateThread(); signals: void processCommand(TQString); public: LockProcess* mParent; + + private: + bool mRunning; + bool mTerminate; + pthread_t mThreadID; }; //=========================================================================== @@ -94,6 +100,9 @@ public: void msgBox( TQMessageBox::Icon type, const TQString &txt ); int execDialog( TQDialog* dlg ); +signals: + void terminateHelperThread(); + public slots: void quitSaver(); void preparePopup(); |