Merge branch 'theqvd-media_argument_bugfix' into 3.6.x

nxcomp/src/ChannelEndPoint.cpp

@@ -312,6 +312,11 @@ ChannelEndPoint::enabled() const {
 }
 
 bool
+ChannelEndPoint::configured() const {
+  return ( spec_ && ( strcmp(spec_, "0") != 0) );
+}
+
+bool
 ChannelEndPoint::validateSpec() {
   isTCP_ = getTCPHostAndPort();
   isUnix_ = getUnixPath();

nxcomp/src/ChannelEndPoint.h

@@ -46,6 +46,7 @@ class ChannelEndPoint
   ~ChannelEndPoint();
   ChannelEndPoint &operator=(const ChannelEndPoint &other);
 
+  bool configured() const;
   bool enabled() const;
   bool disabled() { return !enabled(); }
   void disable();

nxcomp/src/Loop.cpp

@@ -11746,20 +11746,22 @@ int SetPorts()
 	  << logofs_flush;
 #endif
 
-  if (control -> ProxyMode == proxy_client) {
-    mediaPort.setDefaultTCPPort(DEFAULT_NX_MEDIA_PORT_OFFSET + proxyPort);
-    useMediaSocket = mediaPort.enabled();
-  } else {
+  if ( mediaPort.configured() ) {
+    if (control -> ProxyMode == proxy_client) {
+      mediaPort.setDefaultTCPPort(DEFAULT_NX_MEDIA_PORT_OFFSET + proxyPort);
+      useMediaSocket = mediaPort.enabled();
+    } else {
 
-    if ( !mediaPort.enabled() ) {
-      #ifdef PANIC
-      *logofs << "Loop: PANIC! No port specified for multimedia connections.\n"
-              << logofs_flush;
-      #endif
+      if ( mediaPort.getTCPPort() < 0 ) {
+        #ifdef PANIC
+        *logofs << "Loop: PANIC! No port specified for multimedia connections.\n"
+                << logofs_flush;
+        #endif
 
-      cerr << "Error" << ": No port specified for multimedia connections.\n";
+        cerr << "Error" << ": No port specified for multimedia connections.\n";
 
-      HandleCleanup();
+        HandleCleanup();
+      }
     }
   }