Removed duplicated code fragments probably caused by patches with too

few context lines
This commit is contained in:
schmirl 2007-04-26 06:25:13 +00:00
parent fdda49c9f3
commit 8378d5a17c

View File

@ -1,5 +1,5 @@
/* /*
* $Id: connectionVTP.c,v 1.12 2007/04/24 11:40:35 schmirl Exp $ * $Id: connectionVTP.c,v 1.13 2007/04/26 06:25:13 schmirl Exp $
*/ */
#include "server/connectionVTP.h" #include "server/connectionVTP.h"
@ -683,10 +683,6 @@ bool cConnectionVTP::CmdPORT(char *Opts)
m_LiveStreamer->Stop(); m_LiveStreamer->Stop();
delete m_LiveSocket; delete m_LiveSocket;
if(m_LiveSocket && m_LiveStreamer)
m_LiveStreamer->Stop();
delete m_LiveSocket;
m_LiveSocket = new cTBSocket(SOCK_STREAM); m_LiveSocket = new cTBSocket(SOCK_STREAM);
if (!m_LiveSocket->Connect(dataip, dataport)) { if (!m_LiveSocket->Connect(dataip, dataport)) {
esyslog("ERROR: Streamdev: Couldn't open data connection to %s:%d: %s", esyslog("ERROR: Streamdev: Couldn't open data connection to %s:%d: %s",
@ -721,8 +717,6 @@ bool cConnectionVTP::CmdTUNE(char *Opts)
m_LiveStreamer->SetDevice(dev); m_LiveStreamer->SetDevice(dev);
if(m_LiveSocket) if(m_LiveSocket)
m_LiveStreamer->Start(m_LiveSocket); m_LiveStreamer->Start(m_LiveSocket);
if(m_LiveSocket)
m_LiveStreamer->Start(m_LiveSocket);
#if VDRVERSNUM >= 10300 #if VDRVERSNUM >= 10300
if(!m_FilterStreamer) if(!m_FilterStreamer)