From 6ec82a3943d55a41158521311fae360bf848bb6d Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sun, 11 Nov 2012 14:36:17 +0000 Subject: http transport: do not send metadata after abort git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2985 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Transports/http/httpstreamreader.cpp | 2 ++ src/plugins/Transports/mms/mmsinputfactory.cpp | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp index 067a1b170..28c22e8ab 100644 --- a/src/plugins/Transports/http/httpstreamreader.cpp +++ b/src/plugins/Transports/http/httpstreamreader.cpp @@ -360,6 +360,8 @@ qint64 HttpStreamReader::readBuffer(char* data, qint64 maxlen) void HttpStreamReader::checkBuffer() { + if(m_stream.aborted) + return; if (m_stream.buf_fill > m_buffer_size && !m_ready) { m_ready = true; diff --git a/src/plugins/Transports/mms/mmsinputfactory.cpp b/src/plugins/Transports/mms/mmsinputfactory.cpp index e018b2895..beb9fbf87 100644 --- a/src/plugins/Transports/mms/mmsinputfactory.cpp +++ b/src/plugins/Transports/mms/mmsinputfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * + * Copyright (C) 2010-2012 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -21,7 +21,6 @@ #include #include #include -//#include #include #include "settingsdialog.h" #include "mmsinputsource.h" @@ -63,4 +62,4 @@ QTranslator *MMSInputFactory::createTranslator(QObject *parent) translator->load(QString(":/mms_plugin_") + locale); return translator; } -Q_EXPORT_PLUGIN2(mms, MMSInputFactory); +Q_EXPORT_PLUGIN2(mms, MMSInputFactory) -- cgit v1.2.3-13-gbd6f