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

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase/kdm/backend
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2007-11-15 17:00:48
Message-ID: 1195146048.083657.24237.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 737152 by ossi:

backport: do not auto-login again after resuming from console mode


 M  +4 -1      session.c  


--- branches/KDE/3.5/kdebase/kdm/backend/session.c #737151:737152
@@ -145,7 +145,10 @@
 		ReStr( &curtype, "classic" );
 		cursource = (td->hstent->rLogin == 1) ? PWSRC_RELOGIN : PWSRC_MANUAL;
 		return 1;
-	} else if (*td->autoUser && !td->autoDelay && (tdiff > 0 || td->autoAgain))
+	} else if (*td->autoUser && !td->autoDelay &&
+	           ((tdiff > 0 && ((td->displayType & d_lifetime) == dTransient ||
+	                           !td->hstent->lastExit)) ||
+	            td->autoAgain))
 	{
 		unsigned int lmask;
 		Window dummy1, dummy2;
[prev in list] [next in list] [prev in thread] [next in thread]