From c0acaa736ef07da0ce58fe112189a70cd780e518 Mon Sep 17 00:00:00 2001 From: deathbybadaid Date: Tue, 5 Jan 2021 11:49:01 -0500 Subject: [PATCH 1/2] Bugfix --- fHDHR_web/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fHDHR_web/__init__.py b/fHDHR_web/__init__.py index a63cb6b..1a284f8 100644 --- a/fHDHR_web/__init__.py +++ b/fHDHR_web/__init__.py @@ -87,7 +87,7 @@ class fHDHR_HTTP_Server(): if session["tuner_used"] is not None: tuner = self.fhdhr.device.tuners.tuners[str(session["tuner_used"])] if tuner.tuner_lock.locked(): - self.fhdhr.logger.info("Shutting down Tuner #" + str(self.number) + " after Request.") + self.fhdhr.logger.info("Shutting down Tuner #" + str(session["tuner_used"]) + " after Request.") tuner.close() self.fhdhr.logger.debug("Client %s requested %s Closing" % (request.method, request.path)) From e9e0e40d78c3d5a6ab67a1c4d1b26840eae5c7e1 Mon Sep 17 00:00:00 2001 From: deathbybadaid Date: Tue, 5 Jan 2021 12:04:41 -0500 Subject: [PATCH 2/2] Fix Streaming --- fHDHR_web/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fHDHR_web/__init__.py b/fHDHR_web/__init__.py index 1a284f8..baedf98 100644 --- a/fHDHR_web/__init__.py +++ b/fHDHR_web/__init__.py @@ -84,11 +84,11 @@ class fHDHR_HTTP_Server(): def after_request(self, response): # Close Tuner if it was in use, and did not close already - if session["tuner_used"] is not None: - tuner = self.fhdhr.device.tuners.tuners[str(session["tuner_used"])] - if tuner.tuner_lock.locked(): - self.fhdhr.logger.info("Shutting down Tuner #" + str(session["tuner_used"]) + " after Request.") - tuner.close() + # if session["tuner_used"] is not None: + # tuner = self.fhdhr.device.tuners.tuners[str(session["tuner_used"])] + # if tuner.tuner_lock.locked(): + # self.fhdhr.logger.info("Shutting down Tuner #" + str(session["tuner_used"]) + " after Request.") + # tuner.close() self.fhdhr.logger.debug("Client %s requested %s Closing" % (request.method, request.path)) return response