From feb08dfc4ac144a23d3e1f5d11ca19cb6ff2f82d Mon Sep 17 00:00:00 2001
From: Kairlec <sunfokairlec@gmail.com>
Date: Tue, 15 Oct 2024 14:53:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E6=B3=A8=E9=94=80?=
 =?UTF-8?q?=E6=B5=81=E6=97=B6=E6=B2=A1=E6=9C=89=E4=B8=8E=E4=B9=8B=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E7=9A=84=E5=9B=BD=E6=A0=87=E9=80=9A=E9=81=93=E6=97=B6?=
 =?UTF-8?q?=E4=BC=9A=E5=87=BA=E7=8E=B0=E7=9A=84NPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmp/streamPush/service/impl/StreamPushServiceImpl.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
index 0b41086e..aeabcc83 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
@@ -284,7 +284,10 @@ public class StreamPushServiceImpl implements IStreamPushService {
         }
         streamPush.setPushing(false);
         if (userSetting.isUsePushingAsStatus()) {
-            gbChannelService.offline(streamPush.buildCommonGBChannel());
+            CommonGBChannel commonGBChannel = streamPush.buildCommonGBChannel();
+            if (commonGBChannel != null) {
+                gbChannelService.offline(commonGBChannel);
+            }
         }
         sendRtpServerService.deleteByStream(streamPush.getStream());
         mediaServerService.stopSendRtp(mediaServer, streamPush.getApp(), streamPush.getStream(), null);