diff --git a/unix/vncserver b/unix/vncserver index 0cc9b74..31780f2 100755 --- a/unix/vncserver +++ b/unix/vncserver @@ -112,9 +112,7 @@ $cmd = &ConstructXvncCmd(); # Run $cmd and record the process ID. $pidFile = "$vncUserDir/$host:$displayNumber.pid"; &StartXvncAndRecordPID(); - -# Give Xvnc a chance to start up -sleep(3); +&WaitForXvncToStart(); &IfXvncDidntStartTryFixingFontPathAndStartXvncAgain(); @@ -939,7 +937,7 @@ sub IfXvncDidntStartTryFixingFontPathAndStartXvncAgain { $cmd =~ s@-fp [^ ]+@@; $cmd .= " -fp $defFontPath" if ($defFontPath); &StartXvncAndRecordPID(); - sleep(3); + &WaitForXvncToStart(); } } } @@ -956,3 +954,7 @@ sub WarnUserXvncNotStartedAndExit { close(LOG); die "\n"; } + +sub WaitForXvncToStart { + sleep(3); +}