Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
7c92738c
Commit
7c92738c
authored
Apr 19, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(src/components/call/CallModel): do not set data model twice
parent
a19d292b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
CallModel.cpp
linphone-desktop/src/components/call/CallModel.cpp
+4
-0
CallModel.hpp
linphone-desktop/src/components/call/CallModel.hpp
+1
-1
CallsListModel.cpp
linphone-desktop/src/components/calls/CallsListModel.cpp
+0
-2
No files found.
linphone-desktop/src/components/call/CallModel.cpp
View file @
7c92738c
...
...
@@ -108,6 +108,10 @@ CallModel::CallModel (shared_ptr<linphone::Call> linphoneCall) {
);
}
CallModel
::~
CallModel
()
{
mLinphoneCall
->
unsetData
(
"call-model"
);
}
// -----------------------------------------------------------------------------
void
CallModel
::
setRecordFile
(
shared_ptr
<
linphone
::
CallParams
>
&
callParams
)
{
...
...
linphone-desktop/src/components/call/CallModel.hpp
View file @
7c92738c
...
...
@@ -65,7 +65,7 @@ public:
Q_ENUM
(
CallStatus
);
CallModel
(
std
::
shared_ptr
<
linphone
::
Call
>
linphoneCall
);
~
CallModel
()
=
default
;
~
CallModel
();
std
::
shared_ptr
<
linphone
::
Call
>
getLinphoneCall
()
const
{
return
mLinphoneCall
;
...
...
linphone-desktop/src/components/calls/CallsListModel.cpp
View file @
7c92738c
...
...
@@ -179,7 +179,6 @@ void CallsListModel::addCall (const shared_ptr<linphone::Call> &linphoneCall) {
qInfo
()
<<
"Add call:"
<<
call
;
App
::
getInstance
()
->
getEngine
()
->
setObjectOwnership
(
call
,
QQmlEngine
::
CppOwnership
);
linphoneCall
->
setData
(
"call-model"
,
*
call
);
int
row
=
mList
.
count
();
...
...
@@ -193,7 +192,6 @@ void CallsListModel::removeCall (const shared_ptr<linphone::Call> &linphoneCall)
QTimer
::
singleShot
(
DELAY_BEFORE_REMOVE_CALL
,
this
,
[
this
,
linphoneCall
]()
{
CallModel
*
call
=
&
linphoneCall
->
getData
<
CallModel
>
(
"call-model"
);
linphoneCall
->
unsetData
(
"call-model"
);
qInfo
()
<<
"Removing call:"
<<
call
;
...
...
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