Merge branch 'master' of https://github.com/ghost1227/cdm

src/cdm

@@ -145,7 +145,9 @@ case ${flaglist[$binindex]} in
 			while ((display < 7)); do
 				if dpyinfo=$(xdpyinfo -display ":$display.0" 2>&1 1>/dev/null) ||
 					# Display is in use by another user.
-					[[ "$dpyinfo" == 'No protocol specified'* ]]
+					[[ "$dpyinfo" == 'No protocol specified'* ]] ||
+					# Invalid MIT cookie.
+					[[ "$dpyinfo" == 'Invalid MIT'* ]]
 				then
 					let display+=1
 				else

src/cdm-xlaunch

@@ -79,8 +79,8 @@ fi
 # Conform to POSIX and do not use `>&' here.
 sh -i -c "(startx $* > /dev/null 2>&1 &)"
 
-# If wait(1) returns with a value >128, it was interrupted by kill(1), so
-# registration was sucessful.
+# If wait(1) returns with a value >128, it was interrupted by kill(1),
+# so registration was sucessful.
 if [[ -n "$clockpid" ]]; then
 	if wait "$clockpid" >& /dev/null
 	then