summaryrefslogtreecommitdiff
path: root/server/connectionVTP.c
diff options
context:
space:
mode:
Diffstat (limited to 'server/connectionVTP.c')
-rw-r--r--server/connectionVTP.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/server/connectionVTP.c b/server/connectionVTP.c
index 9ffa540..71fa43f 100644
--- a/server/connectionVTP.c
+++ b/server/connectionVTP.c
@@ -774,7 +774,7 @@ cConnectionVTP::~cConnectionVTP()
bool cConnectionVTP::Abort(void) const
{
- return (m_LiveStreamer && m_LiveStreamer->Abort()) ||
+ return !IsOpen() || (m_LiveStreamer && m_LiveStreamer->Abort()) ||
(m_FilterStreamer && m_FilterStreamer->Abort());
}
@@ -1811,3 +1811,14 @@ bool cConnectionVTP::Respond(int Code, const char *Message, ...)
Code < 0 ? -Code : Code,
Code < 0 ? '-' : ' ', *str);
}
+
+cString cConnectionVTP::ToText() const
+{
+ cString str = cServerConnection::ToText();
+ if (m_LiveStreamer)
+ return cString::sprintf("%s\t%s", *str, *m_LiveStreamer->ToText());
+ else if (m_RecPlayer)
+ return cString::sprintf("%s\t%s", *str, m_RecPlayer->getCurrentRecording()->Name());
+ else
+ return str;
+}