Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
J
jami-daemon
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
118
Issues
118
List
Boards
Labels
Milestones
Security & Compliance
Security & Compliance
Dependency List
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-daemon
Commits
f0f2c46f
Commit
f0f2c46f
authored
Aug 02, 2012
by
Tristan Matthews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* #14176: video: destory sip_thread_client earlier
parent
257e154e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
3 deletions
+7
-3
daemon/src/sip/sip_thread_client.cpp
daemon/src/sip/sip_thread_client.cpp
+6
-2
daemon/src/video/video_receive_thread.cpp
daemon/src/video/video_receive_thread.cpp
+1
-1
No files found.
daemon/src/sip/sip_thread_client.cpp
View file @
f0f2c46f
...
...
@@ -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
;
}
}
daemon/src/video/video_receive_thread.cpp
View file @
f0f2c46f
...
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment