if no argc & argv are passed, honour the serverHost&serverPort which was set by the application

1 files changed, 4 insertions, 5 deletions

diff --git a/libvncclient/vncviewer.c b/libvncclient/vncviewer.c
index 07465c7..60f3279 100644
--- a/libvncclient/vncviewer.c
+++ b/libvncclient/vncviewer.c
@@ -108,6 +108,9 @@ rfbClient* rfbGetClient(int bitsPerSample,int samplesPerPixel,
   initAppData(&client->appData);
   client->programName = 0;
   client->endianTest = 1;
+  client->programName="";
+  client->serverHost="";
+  client->serverPort=5900;
 
   client->format.bitsPerPixel = bytesPerPixel*8;
   client->format.depth = bitsPerSample*samplesPerPixel;
@@ -188,11 +191,7 @@ static rfbBool rfbInitConnection(rfbClient* client)
 rfbBool rfbInitClient(rfbClient* client,int* argc,char** argv) {
   int i,j;
 
-  if(argv==0 || argc==0 || *argc==0) {
-    client->programName="";
-    client->serverHost="";
-    client->serverPort=5900;
-  } else {
+  if(argv>0 && argc && *argc) {
     if(client->programName==0)
       client->programName=argv[0];