diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2015-04-13 00:48:27 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-04-14 02:27:28 +0200 |
| commit | 2b0e13211cc2ce86926cfe133ce29df3a6141e91 (patch) | |
| tree | 3dfcf227e926b9637e76d178914447d4e386d722 /kdesktop/lock | |
| parent | 7188f7044b0bb11a24754cfa83d39ecc0721bbdb (diff) | |
| download | tdebase-2b0e13211cc2ce86926cfe133ce29df3a6141e91.tar.gz tdebase-2b0e13211cc2ce86926cfe133ce29df3a6141e91.zip | |
Ensure desktop is completely hidden before sending fullyOnline()
Do not block kdesktop process while waiting for kdesktop_lock to engage prior to VT switch/new VT requests made from within kdesktop
(cherry picked from commit 78d33c29157b8e3a0b81c36f73ec5f958439565c)
Diffstat (limited to 'kdesktop/lock')
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index a4a2badd3..3e818a145 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -1991,8 +1991,8 @@ int LockProcess::execDialog( TQDialog *dlg ) else { bitBlt(this, 0, 0, &backingPixmap); } + saverReadyIfNeeded(); } - saverReadyIfNeeded(); // dlg->exec may generate BadMatch errors, so make sure they are silently ignored int (*oldHandler)(Display *, XErrorEvent *); oldHandler = XSetErrorHandler(ignoreXError); @@ -2091,7 +2091,7 @@ void LockProcess::slotPaintBackground(const TQPixmap &rpm) setGeometry(0, 0, mRootWidth, mRootHeight); erase(); } - saverReadyIfNeeded(); +// saverReadyIfNeeded(); } void LockProcess::preparePopup() |