do not clone conference info object on model creation as it blocks the creation
fix typo in cancelCreation calling
This commit is contained in:
parent
9214cb5fed
commit
4916c0ad6e
2 changed files with 2 additions and 2 deletions
|
|
@ -33,7 +33,7 @@ DEFINE_ABSTRACT_OBJECT(ConferenceInfoModel)
|
||||||
ConferenceInfoModel::ConferenceInfoModel(const std::shared_ptr<linphone::ConferenceInfo> &conferenceInfo,
|
ConferenceInfoModel::ConferenceInfoModel(const std::shared_ptr<linphone::ConferenceInfo> &conferenceInfo,
|
||||||
QObject *parent)
|
QObject *parent)
|
||||||
// TODO : remove cloning when a fix will be done in SDK (#SDK-1001 ticket)
|
// TODO : remove cloning when a fix will be done in SDK (#SDK-1001 ticket)
|
||||||
: mConferenceInfo(conferenceInfo->clone()) {
|
: mConferenceInfo(conferenceInfo) {
|
||||||
mustBeInLinphoneThread(getClassName());
|
mustBeInLinphoneThread(getClassName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -321,7 +321,7 @@ AbstractMainPage {
|
||||||
meetingSetup.conferenceInfoGui.core.save()
|
meetingSetup.conferenceInfoGui.core.save()
|
||||||
//: "Création de la réunion en cours …"
|
//: "Création de la réunion en cours …"
|
||||||
mainWindow.showLoadingPopup(qsTr("meeting_schedule_creation_in_progress"), true, function () {
|
mainWindow.showLoadingPopup(qsTr("meeting_schedule_creation_in_progress"), true, function () {
|
||||||
meetingSetup.conferenceInfoGui.core.cancelCreation()
|
meetingSetup.conferenceInfoGui.core.lCancelCreation()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue