mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Crash fixes on ZRTP popup if call has been end. Close popup on end.

Browse source 
Fix random crash on SettingsModel qml coming from uninitialized model.
This commit is contained in:
Julien Wadel 2023-09-13 10:57:02 +02:00
parent b3a836f11e
commit 9bf230266e
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-app/src/components/call/CallModel.cpp
View file

@ -940,7 +940,7 @@ void CallModel::sendDtmf (const QString &dtmf) {
// -----------------------------------------------------------------------------
void CallModel::verifyAuthenticationToken (bool verify) {
if(mCall)
if(mCall && getStatus() != CallStatusEnded)
mCall->setAuthenticationTokenVerified(verify);
emit securityUpdated();
}

7
linphone-app/ui/modules/Linphone/Dialog/ZrtpTokenAuthenticationDialog.qml
View file

@ -17,6 +17,7 @@ DialogPlus {
property alias localSas: localSasText.text
property alias remoteSas : remoteSasText.text
buttons: [
TextButtonA {
//: 'Later' : Button label to do something in another time.
@ -46,6 +47,12 @@ DialogPlus {
radius: 10
onCallChanged: if(!call) exit(0)
Component.onCompleted: if( !localSas || !remoteSas) mainItem.exit(0)
Connections {
target: call
onStatusChanged: if (status === CallModel.CallStatusEnded) exit(0)
}
ColumnLayout {
id:columnLayout

3
linphone-app/ui/views/App/Main/MainWindowMenuBar.qml
View file

@ -57,7 +57,7 @@ Item {
Shortcut {
id: recordingsShortcut
onActivated: menuParent.displayRecordings()
onActivated: if(CoreManager.initialized && SettingsModel.callRecorderEnabled) menuParent.displayRecordings()
}
// ---------------------------------------------------------------------------
@ -75,6 +75,7 @@ Item {
}
MenuItem{
visible: CoreManager.initialized && SettingsModel.callRecorderEnabled
//: 'Recordings' : Label for the recordings menu.
text: qsTr('recordings')
onTriggered: recordingsShortcut.onActivated()

1
linphone-app/ui/views/App/Main/MainWindowTopMenuBar.qml
View file

@ -28,6 +28,7 @@ MenuBar {
}
MenuItem {
visible: CoreManager.initialized && SettingsModel.callRecorderEnabled
//: 'Recordings' : Label for the recordings menu.
text: qsTr('recordings')
role: MenuItem.ApplicationSpecificRole