mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-02-07 15:08:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(CoreManager): avoid in getChatModelFromSipAddress when migration chat room is used

Browse source
This commit is contained in:
Ronan Abhamon 2018-02-27 10:49:05 +01:00
parent 912b67616c
commit 593055be5d
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/components/core/CoreManager.cpp
View file

@ -94,15 +94,18 @@ shared_ptr<ChatModel> CoreManager::getChatModelFromSipAddress (const QString &si
// Create a new chat model.
if (!mChatModels.contains(sipAddress)) {
Q_ASSERT(mCore->createAddress(::Utils::appStringToCoreString(sipAddress)) != nullptr);
Q_CHECK_PTR(mCore->createAddress(::Utils::appStringToCoreString(sipAddress)));
auto deleter = [this](ChatModel *chatModel) {
mChatModels.remove(chatModel->getSipAddress());
delete chatModel;
};
// Don't use chatModel->getSipAddress() in lambda.
// If it is a migration chat room the chat room sip address can be changed!!!
auto deleter = [this, sipAddress](ChatModel *chatModel) {
bool removed = mChatModels.remove(sipAddress);
Q_ASSERT(removed);
delete chatModel;
};
shared_ptr<ChatModel> chatModel(new ChatModel(sipAddress), deleter);
mChatModels[chatModel->getSipAddress()] = chatModel;
mChatModels[sipAddress] = chatModel;
emit chatModelCreated(chatModel);
@ -111,7 +114,7 @@ shared_ptr<ChatModel> CoreManager::getChatModelFromSipAddress (const QString &si
// Returns an existing chat model.
shared_ptr<ChatModel> chatModel = mChatModels[sipAddress].lock();
Q_CHECK_PTR(chatModel.get());
Q_CHECK_PTR(chatModel);
return chatModel;
}

2
src/components/core/CoreManager.hpp
View file

@ -163,7 +163,7 @@ private:
SettingsModel *mSettingsModel = nullptr;
AccountSettingsModel *mAccountSettingsModel = nullptr;
QHash<QString, std::weak_ptr<ChatModel> > mChatModels;
QHash<QString, std::weak_ptr<ChatModel>> mChatModels;
QTimer *mCbsTimer = nullptr;