Merge branch 'vncserverfix' of https://github.com/michalsrb/tigervnc

1 files changed, 7 insertions, 1 deletions

diff --git a/unix/vncserver b/unix/vncserver
index 9ff24411..64d10c5b 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -302,6 +302,7 @@ if ($fontPath ne $defFontPath) {
 }
 unless (kill 0, `cat $pidFile`) {
     warn "Could not start Xvnc.\n\n";
+    unlink $pidFile;
     open(LOG, "<$desktopLog");
     while (<LOG>) { print; }
     close(LOG);
@@ -587,7 +588,12 @@ sub List
     print "X DISPLAY #\tPROCESS ID\n";
     foreach my $file (@filelist) {
 	if ($file =~ /$host:(\d+)$\.pid/) {
-	    print ":".$1."\t\t".`cat $vncUserDir/$file`;
+	    chop($tmp_pid = `cat $vncUserDir/$file`);
+	    if (kill 0, $tmp_pid) {
+		print ":".$1."\t\t".`cat $vncUserDir/$file`;
+	    } else {
+		unlink ($vncUserDir . "/" . $file);
+	    }
 	}
     }
     exit 1;