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
e09911d8
Commit
e09911d8
authored
Jun 07, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ui/views/App/Calls/CallsWindow): do not show closing virtual window in conference mode
parent
4572a3b9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
CallsWindow.js
linphone-desktop/ui/views/App/Calls/CallsWindow.js
+2
-6
CallsWindow.qml
linphone-desktop/ui/views/App/Calls/CallsWindow.qml
+3
-3
No files found.
linphone-desktop/ui/views/App/Calls/CallsWindow.js
View file @
e09911d8
...
...
@@ -81,15 +81,11 @@ function handleCallTransferAsked (call) {
})
}
function
handleDetachedVirtualWindow
()
{
handleCountChanged
(
calls
.
count
)
}
function
windowMustBeClosed
()
{
return
calls
.
count
===
0
&&
!
window
.
virtualWindowVisible
return
Linphone
.
CallsListModel
.
rowCount
()
===
0
&&
!
window
.
virtualWindowVisible
}
function
handleCountChanged
()
{
function
tryToCloseWindow
()
{
if
(
windowMustBeClosed
())
{
// Workaround, it's necessary to use a timeout because at last call termination
// a segfault is emit in `QOpenGLContext::functions() const ()`.
...
...
linphone-desktop/ui/views/App/Calls/CallsWindow.qml
View file @
e09911d8
...
...
@@ -55,7 +55,7 @@ Window {
// ---------------------------------------------------------------------------
onClosing
:
Logic
.
handleClosing
(
close
)
onDetachedVirtualWindow
:
Logic
.
handleDetachedVirtual
Window
()
onDetachedVirtualWindow
:
Logic
.
tryToClose
Window
()
// ---------------------------------------------------------------------------
...
...
@@ -124,8 +124,6 @@ Window {
conferenceModel
:
ConferenceModel
{}
model
:
CallsListProxyModel
{}
onCountChanged
:
Logic
.
handleCountChanged
(
count
)
}
}
}
...
...
@@ -212,10 +210,12 @@ Window {
// ---------------------------------------------------------------------------
// Handle transfer.
// Handle count changed. Not on proxy model!!!
// ---------------------------------------------------------------------------
Connections
{
target
:
CallsListModel
onCallTransferAsked
:
Logic
.
handleCallTransferAsked
(
callModel
)
onRowsRemoved
:
Logic
.
tryToCloseWindow
()
}
}
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