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

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

Loading…
Cancel
Save