aboutsummaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/Transports/http/httpstreamreader.cpp3
-rw-r--r--src/plugins/Transports/mms/mmsstreamreader.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/Transports/http/httpstreamreader.cpp b/src/plugins/Transports/http/httpstreamreader.cpp
index adf9916e7..3141dce77 100644
--- a/src/plugins/Transports/http/httpstreamreader.cpp
+++ b/src/plugins/Transports/http/httpstreamreader.cpp
@@ -262,7 +262,8 @@ void HttpStreamReader::abort()
}
m_stream.aborted = true;
m_mutex.unlock();
- m_thread->wait();
+ if(m_thread->isRunning())
+ m_thread->wait();
if (m_handle)
{
curl_easy_cleanup(m_handle);
diff --git a/src/plugins/Transports/mms/mmsstreamreader.cpp b/src/plugins/Transports/mms/mmsstreamreader.cpp
index 8bc9e9790..1e4e46d86 100644
--- a/src/plugins/Transports/mms/mmsstreamreader.cpp
+++ b/src/plugins/Transports/mms/mmsstreamreader.cpp
@@ -123,7 +123,8 @@ void MMSStreamReader::abort()
}
m_aborted = true;
m_mutex.unlock();
- m_thread->wait();
+ if(m_thread->isRunning())
+ m_thread->wait();
m_ready = false;
if (m_handle)
mmsx_close(m_handle);