From b454386b296153106b131dfddffd96da7b4cba89 Mon Sep 17 00:00:00 2001
From: ThisBirchWood <dylanseandefaoite@gmail.com>
Date: Mon, 3 Mar 2025 20:23:27 +0000
Subject: [PATCH] PATCH: Fixed end stream not working with  OBS

---
 web_server/blueprints/streams.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/web_server/blueprints/streams.py b/web_server/blueprints/streams.py
index b547229..b5eb858 100644
--- a/web_server/blueprints/streams.py
+++ b/web_server/blueprints/streams.py
@@ -350,10 +350,11 @@ def end_stream():
     """
     print("Ending stream", flush=True)
 
-    stream_key = request.get_json().get("key")
-    
-    if not stream_key:
-        # Try getting stream_key from form data (for nginx in the case that the stream is ended on OBS's end)
+    if request.is_json:
+        # stream key from StreamDashboard
+        stream_key = request.get_json().get("key")
+    else:
+        # stream key from OBS
         stream_key = request.form.get("name")
 
     if stream_key is None: