Merge remote-tracking branch 'origin/master'

This commit is contained in:
648540858
2024-10-15 15:06:35 +08:00
6 changed files with 7 additions and 4 deletions

View File

@@ -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);