[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/libs/kdm
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2010-10-09 10:21:24
Message-ID: 20101009102124.D6AC4AC895 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1184162 by ossi:

forwardport: don't crash on excess presses of <return>

a bouncing or held down return key would cause the last field (password)
to be re-sent to the core, which would of course cause a protocol error
and subsequent shutdown. relates to bug 251987

 M  +2 -1      kgreet_classic.cpp  
 M  +2 -1      kgreet_winbind.cpp  


--- trunk/KDE/kdebase/workspace/libs/kdm/kgreet_classic.cpp #1184161:1184162
@@ -309,6 +309,7 @@
 KClassicGreeter::next()
 {
     // assert(running);
+    int pHas = has;
     if (loginEdit && loginEdit->hasFocus()) {
         passwdEdit->setFocus(); // will cancel running login if necessary
         has = 0;
@@ -328,7 +329,7 @@
     }
     if (exp < 0)
         handler->gplugStart();
-    else if (has >= exp)
+    else if (has >= exp && has > pHas)
         returnData();
 }
 
--- trunk/KDE/kdebase/workspace/libs/kdm/kgreet_winbind.cpp #1184161:1184162
@@ -390,6 +390,7 @@
 KWinbindGreeter::next()
 {
     // assert(running);
+    int pHas = has;
     if (domainCombo && domainCombo->hasFocus()) {
         loginEdit->setFocus();
     } else if (loginEdit && loginEdit->hasFocus()) {
@@ -411,7 +412,7 @@
     }
     if (exp < 0)
         handler->gplugStart();
-    else if (has >= exp)
+    else if (has >= exp && has > pHas)
         returnData();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]