summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Schmirler <vdr@schmirler.de>2012-12-16 13:12:42 +0100
committerFrank Schmirler <vdr@schmirler.de>2012-12-16 13:12:42 +0100
commit50d249c62e8ae9c062278bf73d8edfff060cd6c7 (patch)
treee670a59e65c75f4873dfd1e8820ddd800ffc8948
parent0fb7076192f60472cd5885767898d79400adfa81 (diff)
downloadvdr-plugin-streamdev-50d249c62e8ae9c062278bf73d8edfff060cd6c7.tar.gz
vdr-plugin-streamdev-50d249c62e8ae9c062278bf73d8edfff060cd6c7.tar.bz2
Don't abort VTP connection if filter stream is broken
-rw-r--r--HISTORY1
-rw-r--r--server/connectionVTP.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 587092e..0d79204 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,7 @@
VDR Plugin 'streamdev' Revision History
---------------------------------------
+- Don't abort VTP connection if filter stream is broken
- Restructured cStreamdevStreamer: Moved inbound buffer into actual subclass.
- In cStreamdevStreamer dropped Activate(bool) and moved its code into Start().
- Moved cStreamdevFilterStreamer to livefilter.[hc]
diff --git a/server/connectionVTP.c b/server/connectionVTP.c
index bf4b0c2..1366e42 100644
--- a/server/connectionVTP.c
+++ b/server/connectionVTP.c
@@ -770,7 +770,7 @@ cConnectionVTP::~cConnectionVTP()
bool cConnectionVTP::Abort(void) const
{
return !IsOpen() || (m_LiveStreamer && m_LiveStreamer->Abort()) ||
- (m_FilterStreamer && m_FilterStreamer->Abort());
+ (!m_LiveStreamer && m_FilterStreamer && m_FilterStreamer->Abort());
}
void cConnectionVTP::Welcome(void)