summaryrefslogtreecommitdiffstats
path: root/unix/vncserver
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2016-07-08 14:11:42 +0200
committerPierre Ossman <ossman@cendio.se>2016-07-08 14:11:42 +0200
commit1db99eb9ec1868620d1fb49d51f3a2caa8386f77 (patch)
tree17bd8ddada4ab126e6a18cac93752f665d28166b /unix/vncserver
parent024cee5d203c45ba803c30057ae77b442d23112d (diff)
parent3f2bb341c9734c41a3f0123e44fd27ae50deb18c (diff)
downloadtigervnc-1db99eb9ec1868620d1fb49d51f3a2caa8386f77.tar.gz
tigervnc-1db99eb9ec1868620d1fb49d51f3a2caa8386f77.zip
Merge branch 'clipboard'
Diffstat (limited to 'unix/vncserver')
-rwxr-xr-xunix/vncserver2
1 files changed, 0 insertions, 2 deletions
diff --git a/unix/vncserver b/unix/vncserver
index 8f1f4b7c..674eadad 100755
--- a/unix/vncserver
+++ b/unix/vncserver
@@ -387,8 +387,6 @@ if (-e "/tmp/.X11-unix/X$displayNumber" ||
}
$ENV{VNCDESKTOP}= $desktopName;
-system($exedir."vncconfig -nowin >> " . &quotedString($desktopLog) . " 2>&1 &");
-
if ($opt{'-fg'}) {
if (! $skipxstartup) {
system("$xstartup >> " . &quotedString($desktopLog) . " 2>&1");