From 14f91f31f64ea9998762784aaf770539b162086e Mon Sep 17 00:00:00 2001
From: 132ikl <132@ikl.sh>
Date: Tue, 3 Mar 2020 00:04:34 -0500
Subject: [PATCH] F/MO: Fix H264 port (last time i promise), fix DHCP setting
 shown on frontend

---
 opsi/frontend/templates/settings.html | 4 ++--
 opsi/modules/videoio/h264.py          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opsi/frontend/templates/settings.html b/opsi/frontend/templates/settings.html
index 2f1c653..bcc3ef3 100644
--- a/opsi/frontend/templates/settings.html
+++ b/opsi/frontend/templates/settings.html
@@ -54,8 +54,8 @@ <h3>General</h3>
         <div id="net-pi-settings">
             <label for="ip-assign">IP Assignment Mode:</label>
             <select id="ip-assign">
-                <option value="DHCP" {{"selected" if not persist.network.dhcp}}>DHCP</option>
-                <option value="Static" {{"selected" if persist.network.dhcp}}>Static</option>
+                <option value="DHCP" {{"selected" if persist.network.dhcp}}>DHCP</option>
+                <option value="Static" {{"selected" if not persist.network.dhcp}}>Static</option>
             </select>
             <br>
             <div id="static-ext-div">
diff --git a/opsi/modules/videoio/h264.py b/opsi/modules/videoio/h264.py
index a038ec2..7d7bff4 100644
--- a/opsi/modules/videoio/h264.py
+++ b/opsi/modules/videoio/h264.py
@@ -48,9 +48,9 @@ def register(self, func: "H264CameraServer"):
         self.pipelines[func.name] = pipeline
         if NT_AVAIL:
             url = self.hook.url.split("/")[2].split(":")[0]
-            port = "" if self.port == 554 else self.port
+            port = "" if self.port == 554 else ":{self.port}"
             NetworkDict(f"/GStreamer/{func.name}")["/streams"] = [
-                f"rtsp://{url}:{port}/{func.name}",
+                f"rtsp://{url}{port}/{func.name}",
             ]
 
     def unregister(self, func: "H264CameraServer"):