Fix kdesktop_lock crash on error with certain PAM stack configurations

(cherry picked from commit 2028aa37a3)
pull/182/head
Timothy Pearson 9 years ago committed by Slávek Banko
parent 9698874290
commit e2625ec021

@ -402,22 +402,32 @@ KClassicGreeter::failed()
void // virtual
KClassicGreeter::revive()
{
// assert( !running );
setActive2( true );
// assert(!running);
setActive2(true);
if (authTok) {
passwd1Edit->erase();
passwd2Edit->erase();
passwd1Edit->setFocus();
} else {
if (passwd1Edit) {
passwd1Edit->erase();
}
if (passwd2Edit) {
passwd2Edit->erase();
}
if (passwd1Edit) {
passwd1Edit->setFocus();
}
}
else {
passwdEdit->erase();
if (loginEdit && loginEdit->isEnabled())
if (loginEdit && loginEdit->isEnabled()) {
passwdEdit->setEnabled( true );
}
else {
setActive( true );
if (loginEdit && loginEdit->text().isEmpty())
if (loginEdit && loginEdit->text().isEmpty()) {
loginEdit->setFocus();
else
}
else {
passwdEdit->setFocus();
}
}
}
}

Loading…
Cancel
Save