From df258d127fb87d328bcfc27fb401252fdbd041c7 Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Tue, 27 Jan 2015 21:31:39 +0200
Subject: [PATCH] Reverted the force locking quirk for Triax TSS 400.

---
 HISTORY  | 1 -
 server.c | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/HISTORY b/HISTORY
index 09134e6..ee06bd3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -114,4 +114,3 @@ VDR Plugin 'satip' Revision History
 - Fixed memory deallocation errors.
 - Cleaned up all scan-build warnings.
 - Refactored the frontend handling.
-- Added the force locking quirk for Triax TSS 400.
diff --git a/server.c b/server.c
index a658825..ecb9eaf 100644
--- a/server.c
+++ b/server.c
@@ -96,8 +96,7 @@ cSatipServer::cSatipServer(const char *addressP, const char *modelP, const char
         quirksM = cString::sprintf("%s%sPlayPids", *quirksM, isempty(*quirksM) ? "" : ",");
         }
      // These devices contain a frontend locking bug:
-     if (strstr(*descriptionM, "fritzdvbc") ||          // Fritz!WLAN Repeater DVB-C
-         strstr(*descriptionM, "Triax SatIP Converter") // Triax TSS 400
+     if (strstr(*descriptionM, "fritzdvbc")             // Fritz!WLAN Repeater DVB-C
         ) {
         quirkM |= eSatipQuirkForceLock;
         quirksM = cString::sprintf("%s%sForceLock", *quirksM, isempty(*quirksM) ? "" : ",");
@@ -105,7 +104,7 @@ cSatipServer::cSatipServer(const char *addressP, const char *modelP, const char
      debug3("%s description=%s quirks=%s", __PRETTY_FUNCTION__, *descriptionM, *quirksM);
      }
   // These devices support the X_PMT protocol extension
-  if (strstr(*descriptionM, "OctopusNet"))           // Digital Devices OctopusNet
+  if (strstr(*descriptionM, "OctopusNet"))              // Digital Devices OctopusNet
      hasCiM = true;
   char *s, *p = strdup(*modelM);
   char *r = strtok_r(p, ",", &s);