Harden lock against rare race condition that caused two password prompts to appear

Provide alternate secure dialog text string when username cannot be obtained

1 files changed, 6 insertions, 1 deletions

diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cc
index 717d98cc0..08a70a17d 100644
--- a/kdesktop/lock/securedlg.cc
+++ b/kdesktop/lock/securedlg.cc
@@ -91,7 +91,12 @@ SecureDlg::SecureDlg(LockProcess *parent)
     if (userString == "") {
         userString = user.loginName();
     }
-    mLogonStatus->setText(i18n("'%1' is currently logged on").arg( user.fullName() ));
+    if (userString != "") {
+        mLogonStatus->setText(i18n("'%1' is currently logged on").arg( user.fullName() ));
+    }
+    else {
+        mLogonStatus->setText(i18n("You are currently logged on"));	// We should never get here, and this message is somewhat obtuse, but it is better than displaying two qotation marks with no text between them...
+    }
 
     KSeparator *sep = new KSeparator( KSeparator::HLine, frame );