jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

* #14176: video: destory sip_thread_client earlier

Browse Source
This commit is contained in:
Tristan Matthews
2012-08-02 14:24:40 -04:00
parent 257e154eaa
commit f0f2c46fa8
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/src/sip/sip_thread_client.cpp
View File

@ -44,7 +44,11 @@ SIPThreadClient::~SIPThreadClient()
{
if (thread_) {
WARN("Destroying thread handle");
pj_thread_join(thread_);
pj_thread_destroy(thread_);
if (pj_thread_join(thread_) != PJ_SUCCESS) {
ERROR("Error on thread join");
} else if (pj_thread_destroy(thread_) != PJ_SUCCESS) {
ERROR("Error on thread destroy");
}
thread_ = 0;
}
}

2
daemon/src/video/video_receive_thread.cpp
View File

@ -285,12 +285,12 @@ void VideoReceiveThread::run()
}
yield();
}
sipThreadClient_.reset();
}
VideoReceiveThread::~VideoReceiveThread()
{
receiving_ = false;
sipThreadClient_.reset(0);
Manager::instance().getVideoControls()->stoppedDecoding(id_, sink_.openedName());
ost::Thread::terminate();