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
8eb3127d
Commit
8eb3127d
authored
Jun 21, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(Incall): avoid dead lock in fullscreen mode when a call is ended
parent
06b7347d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
9 deletions
+17
-9
Incall.js
ui/views/App/Calls/Incall.js
+4
-4
IncallFullscreenWindow.qml
ui/views/App/Calls/IncallFullscreenWindow.qml
+13
-5
No files found.
ui/views/App/Calls/Incall.js
View file @
8eb3127d
...
...
@@ -42,7 +42,8 @@ function handleStatusChanged (status) {
if
(
status
===
Linphone
.
CallModel
.
CallStatusEnded
)
{
var
fullscreen
=
incall
.
_fullscreen
if
(
fullscreen
)
{
fullscreen
.
exit
()
// Timeout => Avoid dead lock on mac.
Utils
.
setTimeout
(
window
,
0
,
fullscreen
.
exit
)
}
telKeypad
.
visible
=
false
...
...
@@ -104,10 +105,9 @@ function showFullscreen () {
return
}
incall
.
_fullscreen
=
Utils
.
openWindow
(
Qt
.
resolvedUrl
(
'
IncallFullscreenWindow.qml
'
),
incall
,
{
incall
.
_fullscreen
=
Utils
.
openWindow
(
Qt
.
resolvedUrl
(
'
IncallFullscreenWindow.qml
'
),
window
,
{
properties
:
{
call
:
incall
.
call
,
callsWindow
:
incall
caller
:
incall
}
})
}
...
...
ui/views/App/Calls/IncallFullscreenWindow.qml
View file @
8eb3127d
...
...
@@ -17,8 +17,7 @@ Window {
// ---------------------------------------------------------------------------
property
var
call
property
var
callsWindow
property
var
caller
property
bool
hideButtons
:
false
// ---------------------------------------------------------------------------
...
...
@@ -38,10 +37,10 @@ Window {
// ---------------------------------------------------------------------------
Component.onCompleted
:
{
incall
.
call
=
caller
.
call
var
show
=
function
(
visibility
)
{
if
(
visibility
===
Window
.
Windowed
)
{
incall
.
visibilityChanged
.
disconnect
(
show
)
incall
.
visible
=
true
incall
.
showFullScreen
()
}
}
...
...
@@ -69,7 +68,12 @@ Window {
Loader
{
anchors.fill
:
parent
active
:
!
incall
.
callsWindow
.
cameraActivated
active
:
{
var
caller
=
incall
.
caller
return
caller
&&
!
caller
.
cameraActivated
}
sourceComponent
:
camera
Component
{
...
...
@@ -350,7 +354,11 @@ Window {
// ---------------------------------------------------------------------------
Loader
{
active
:
!
incall
.
callsWindow
.
cameraActivated
active
:
{
var
caller
=
incall
.
caller
return
caller
&&
!
caller
.
cameraActivated
}
sourceComponent
:
cameraPreview
Component
{
...
...
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