Permalink
Browse files

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

  • Loading branch information...
2 parents 46bed3d + 91b2e07 commit 723149c6bd58968f0cf165629fc21d28c4dd7d64 @CasperVector committed Aug 23, 2012
Showing with 5 additions and 3 deletions.
  1. +3 −1 src/cdm
  2. +2 −2 src/cdm-xlaunch
View
@@ -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
View
@@ -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

0 comments on commit 723149c

Please sign in to comment.