From 5e77aed01e1e2708ee6a663bc69f85f3768d61bd Mon Sep 17 00:00:00 2001 From: Andreas Date: Tue, 18 Nov 2014 11:55:27 +0100 Subject: [PATCH] Cancel transcode when downloader disconnects. --- src/networkremote/songsender.cpp | 7 +++++++ src/networkremote/songsender.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/networkremote/songsender.cpp b/src/networkremote/songsender.cpp index 3d9471788..8ec4a30b7 100644 --- a/src/networkremote/songsender.cpp +++ b/src/networkremote/songsender.cpp @@ -56,6 +56,13 @@ SongSender::SongSender(Application* app, RemoteClient* client) total_transcode_ = 0; } +SongSender::~SongSender() { + disconnect(transcoder_, SIGNAL(JobComplete(QString, QString, bool)), this, + SLOT(TranscodeJobComplete(QString, QString, bool))); + disconnect(transcoder_, SIGNAL(AllJobsComplete()), this, SLOT(StartTransfer())); + transcoder_->Cancel(); +} + void SongSender::SendSongs(const pb::remote::RequestDownloadSongs& request) { Song current_song = app_->player()->GetCurrentItem()->Metadata(); switch (request.download_item()) { diff --git a/src/networkremote/songsender.h b/src/networkremote/songsender.h index a6d24fcad..5b1254cde 100644 --- a/src/networkremote/songsender.h +++ b/src/networkremote/songsender.h @@ -26,6 +26,7 @@ class SongSender : public QObject { Q_OBJECT public: SongSender(Application* app, RemoteClient* client); + ~SongSender(); static const quint32 kFileChunkSize;