changeset 608:2f8fa0919582

null point
author tobaru
date Wed, 19 Feb 2020 15:40:05 +0900
parents 8f270c9d0d4c
children e986dad88692
files src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Wed Feb 19 15:03:02 2020 +0900
+++ b/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java	Wed Feb 19 15:40:05 2020 +0900
@@ -88,7 +88,7 @@
         Decoder decoder = zdecdoder;
 
         if (rfb.isTreeManager()) zdecdoder.setMuticast(true);
-        if (rfb.multicastBlocking) zdecdoder.setBroadcast(true);
+        if (rfb.multicastBlocking || rfb.getViewer().getUseMulticast()) zdecdoder.setBroadcast(true);
         decoders.setDecoderByType(EncodingType.ZLIB, decoder);
         decoders.setDecoderByType(EncodingType.ZRLE, decoder);
         ZRLEESender zdecdoder1 = new ZRLEESender(rfb);
--- a/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java	Wed Feb 19 15:03:02 2020 +0900
+++ b/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java	Wed Feb 19 15:40:05 2020 +0900
@@ -940,11 +940,13 @@
     }
 
     public synchronized void startBroadcast(ReceiverTask receiverTask) {
-        BroadcastRFBListener rfbBroadcastListener = viewer.getRfbBroadcastListener();
-        rfbBroadcastListener.init(this, receiverTask);
-        if (!isTreeManager && !rfbBroadcastListener.isStopFlag()) {
-            Thread rfbBroadcast = new Thread(rfbBroadcastListener, "RFBBroadcast");
-            rfbBroadcast.start();
+        if (viewer.getUseMulticast()) {
+            BroadcastRFBListener rfbBroadcastListener = viewer.getRfbBroadcastListener();
+            rfbBroadcastListener.init(this, receiverTask);
+            if (!isTreeManager && !rfbBroadcastListener.isStopFlag()) {
+                Thread rfbBroadcast = new Thread(rfbBroadcastListener, "RFBBroadcast");
+                rfbBroadcast.start();
+            }
         }
     }