Prevent two unlock dialogs from appearing in any situation

(cherry picked from commit 3e5e79fb21)
v3.5.13-sru
Timothy Pearson 12 years ago committed by Slávek Banko
parent 75ec507bc3
commit cd375d8c7c

@ -1769,9 +1769,15 @@ void LockProcess::resume( bool force )
// //
bool LockProcess::checkPass() bool LockProcess::checkPass()
{ {
if (!mDialogs.isEmpty()) {
// Another dialog is already shown
// Abort!
return 0;
}
if (mInfoMessageDisplayed == false) { if (mInfoMessageDisplayed == false) {
if (mAutoLogout) if (mAutoLogout) {
killTimer(mAutoLogoutTimerId); killTimer(mAutoLogoutTimerId);
}
// Make sure we never launch the SAK or login dialog if windows are being closed down // Make sure we never launch the SAK or login dialog if windows are being closed down
// Otherwise we can get stuck in an irrecoverable state where any attempt to show the login screen is instantly aborted // Otherwise we can get stuck in an irrecoverable state where any attempt to show the login screen is instantly aborted

Loading…
Cancel
Save