From c1f9b95a089e93055701e033df83938be2c87478 Mon Sep 17 00:00:00 2001
From: Ingo Oppermann <ingo@datarhei.com>
Date: Fri, 15 Dec 2023 14:01:40 +0100
Subject: [PATCH] Fix RTMPS address with custom ports (datarhei/restreamer#658)

---
 src/utils/restreamer.js           |  2 +-
 src/views/Edit/Sources/Network.js | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/utils/restreamer.js b/src/utils/restreamer.js
index c60bf16..1227ca4 100644
--- a/src/utils/restreamer.js
+++ b/src/utils/restreamer.js
@@ -858,7 +858,7 @@ class Restreamer {
 		if (config.source.network.rtmp.secure === true) {
 			const [, rtmp_port] = splitHostPort(val.config.rtmp.address_tls);
 			if (rtmp_port !== '1935') {
-				config.source.network.rtmp.host += ':' + rtmp_port;
+				config.source.network.rtmp.host = config.hostname + ':' + rtmp_port;
 			}
 		}
 
diff --git a/src/views/Edit/Sources/Network.js b/src/views/Edit/Sources/Network.js
index dd3f14b..60f4fb0 100644
--- a/src/views/Edit/Sources/Network.js
+++ b/src/views/Edit/Sources/Network.js
@@ -634,13 +634,13 @@ function AdvancedSettings(props) {
 										? settings.push.type === 'hls'
 											? settings.general.analyzeduration_http
 											: settings.push.type === 'rtmp'
-											? settings.general.analyzeduration_rtmp
-											: settings.general.analyzeduration
+											  ? settings.general.analyzeduration_rtmp
+											  : settings.general.analyzeduration
 										: protocolClass === 'http'
-										? settings.general.analyzeduration_http
-										: protocolClass === 'rtmp'
-										? settings.general.analyzeduration_rtmp
-										: settings.general.analyzeduration
+										  ? settings.general.analyzeduration_http
+										  : protocolClass === 'rtmp'
+										    ? settings.general.analyzeduration_rtmp
+										    : settings.general.analyzeduration
 								}
 								onChange={props.onChange(
 									'general',
@@ -648,13 +648,13 @@ function AdvancedSettings(props) {
 										? settings.push.type === 'hls'
 											? 'analyzeduration_http'
 											: settings.push.type === 'rtmp'
-											? 'analyzeduration_rtmp'
-											: 'analyzeduration'
+											  ? 'analyzeduration_rtmp'
+											  : 'analyzeduration'
 										: protocolClass === 'http'
-										? 'analyzeduration_http'
-										: protocolClass === 'rtmp'
-										? 'analyzeduration_rtmp'
-										: 'analyzeduration',
+										  ? 'analyzeduration_http'
+										  : protocolClass === 'rtmp'
+										    ? 'analyzeduration_rtmp'
+										    : 'analyzeduration',
 								)}
 							/>
 							<Typography variant="caption">