Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
c9c4ab55
Commit
c9c4ab55
authored
Feb 02, 2018
by
Ronan
Browse files
fix(RemoteConferenceEventHandler): remove listener only if core exists + add `me` in main db tests
parent
e62d8fff
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/conference/handlers/remote-conference-event-handler.cpp
View file @
c9c4ab55
...
...
@@ -233,7 +233,12 @@ Object(*new RemoteConferenceEventHandlerPrivate) {
RemoteConferenceEventHandler
::~
RemoteConferenceEventHandler
()
{
L_D
();
d
->
conf
->
getCore
()
->
getPrivate
()
->
unregisterListener
(
d
);
try
{
d
->
conf
->
getCore
()
->
getPrivate
()
->
unregisterListener
(
d
);
}
catch
(
const
bad_weak_ptr
&
)
{
// Unable to unregister listener here. Core is destroyed and the listener doesn't exist.
}
if
(
d
->
lev
)
unsubscribe
();
...
...
src/core/core-accessor.cpp
View file @
c9c4ab55
...
...
@@ -56,7 +56,7 @@ shared_ptr<Core> CoreAccessor::getCore () const {
shared_ptr
<
Core
>
core
=
d
->
core
.
lock
();
if
(
!
core
)
{
lWarning
()
<<
"Unable to get valid core instance."
;
throw
std
::
bad_weak_ptr
();
throw
bad_weak_ptr
();
}
return
core
;
...
...
tester/db/linphone.db
View file @
c9c4ab55
No preview for this file type
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