summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock/lockprocess.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-04-20 02:03:19 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-04-20 02:03:19 +0000
commit8ff2829c737b268a10b049c87cd9e62321207472 (patch)
treec262f338289c07b040eac932d627cde09c55a511 /kdesktop/lock/lockprocess.h
parent1d558b0bda448c839f784a5dfa208782f90972f6 (diff)
downloadtdebase-8ff2829c737b268a10b049c87cd9e62321207472.tar.gz
tdebase-8ff2829c737b268a10b049c87cd9e62321207472.zip
Prevent a Qt race condition where the dialog can be tested as existing, then the dialog pointer can be set to NULL by a dialog internal exit before a subsequent dialog call executes.
Essentially these patches lock out the dialog pointer reset until the subsequent dialog call completes after the dialog exist check. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1116662 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdesktop/lock/lockprocess.h')
-rw-r--r--kdesktop/lock/lockprocess.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/kdesktop/lock/lockprocess.h b/kdesktop/lock/lockprocess.h
index ee1621bc8..91d7658b2 100644
--- a/kdesktop/lock/lockprocess.h
+++ b/kdesktop/lock/lockprocess.h
@@ -135,6 +135,7 @@ private:
bool mAutoLogout;
bool mInfoMessageDisplayed;
QDialog *currentDialog;
+ bool mDialogControLock;
bool mForceReject;
bool mPipeOpen;