mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-03 22:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix errors on exit

Browse source
This commit is contained in:
Julien Wadel 2022-09-06 11:06:53 +02:00
parent cfa2205de4
commit e96c2044da
3 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
linphone-app/src/components/core/CoreManager.cpp
View file

@ -145,13 +145,15 @@ void CoreManager::init (QObject *parent, const QString &configPath) {
void CoreManager::uninit () {
if (mInstance) {
mInstance->stopIterate();
auto core = mInstance->mCore;
mInstance->lockVideoRender();// Stop do iterations. We have to protect GUI.
mInstance->mCore->stop();// This is a synchronized stop.
mInstance->unlockVideoRender();
if( mInstance->mCore->getGlobalState() != linphone::GlobalState::Off)
qWarning() << "Core is not off after stopping it. It may result to have multiple core instance.";
delete mInstance;
delete mInstance; // This will also remove stored Linphone objects.
mInstance = nullptr;
core->stop();
if( core->getGlobalState() != linphone::GlobalState::Off)
qWarning() << "Core is not off after stopping it. It may result to have multiple core instance.";
}
}

20
linphone-app/ui/modules/Common/Form/Buttons/ExclusiveButtons.qml
View file

@ -46,15 +46,17 @@ Row {
SmallButton {
capitalization: item.capitalization
anchors.verticalCenter: parent.verticalCenter
backgroundColor: selectedButton === index
? item.style.button.color.selected
: (down
? item.style.button.color.pressed
: (hovered
? item.style.button.color.hovered
: item.style.button.color.normal
)
)
backgroundColor: item.style
? selectedButton === index
? item.style.button.color.selected
: (down
? item.style.button.color.pressed
: (hovered
? item.style.button.color.hovered
: item.style.button.color.normal
)
)
: ''
text: modelData
radius: height/2

6
linphone-app/ui/modules/Common/Form/Fields/ScrollableListViewField.qml
View file

@ -14,7 +14,7 @@ Rectangle {
property QtObject textFieldStyle : TextFieldStyle.normal
color: textFieldStyle ? textFieldStyle.background.color.normal : undefined
color: textFieldStyle ? textFieldStyle.background.color.normal : ''
radius: textFieldStyle ? textFieldStyle.background.radius : 0
Item {
@ -27,7 +27,7 @@ Rectangle {
anchors.fill: parent
border {
color: textFieldStyle ? textFieldStyle.background.border.color.normal : undefined
color: textFieldStyle ? textFieldStyle.background.border.color.normal : ''
width: textFieldStyle ? textFieldStyle.background.border.width : 0
}
@ -37,7 +37,7 @@ Rectangle {
Rectangle {
anchors.fill: parent
color: textFieldStyle ? textFieldStyle.background.color.readOnly : undefined
color: textFieldStyle ? textFieldStyle.background.color.readOnly : ''
opacity: 0.8
visible: field.readOnly
}