mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 03:18:07 +00:00
fix ephemeral messages #LINQT-1880
This commit is contained in:
parent
969995283a
commit
2361f49c1d
2 changed files with 7 additions and 3 deletions
|
|
@ -59,7 +59,7 @@ QSharedPointer<ChatCore> EventLogList::getChatCore() const {
|
|||
return mChatCore;
|
||||
}
|
||||
|
||||
void EventLogList::connectItem(const QSharedPointer<EventLogCore> item) {
|
||||
void EventLogList::connectItem(const QSharedPointer<EventLogCore> &item) {
|
||||
auto message = item->getChatMessageCore();
|
||||
if (message) {
|
||||
connect(message.get(), &ChatMessageCore::deleted, this, [this, item] {
|
||||
|
|
@ -89,6 +89,7 @@ void EventLogList::setChatCore(QSharedPointer<ChatCore> core) {
|
|||
auto it = std::find_if(eventsList.begin(), eventsList.end(),
|
||||
[event](const QSharedPointer<EventLogCore> item) { return item == event; });
|
||||
if (it == eventsList.end()) {
|
||||
connectItem(event);
|
||||
add(event);
|
||||
int index;
|
||||
get(event.get(), &index);
|
||||
|
|
@ -154,7 +155,10 @@ void EventLogList::setSelf(QSharedPointer<EventLogList> me) {
|
|||
emit listAboutToBeReset();
|
||||
for (auto &event : getSharedList<EventLogCore>()) {
|
||||
auto message = event->getChatMessageCore();
|
||||
if (message) disconnect(message.get(), &ChatMessageCore::deleted, this, nullptr);
|
||||
if (message) {
|
||||
disconnect(message.get(), &ChatMessageCore::ephemeralDurationChanged, this, nullptr);
|
||||
disconnect(message.get(), &ChatMessageCore::deleted, this, nullptr);
|
||||
}
|
||||
}
|
||||
if (!mChatCore) return;
|
||||
auto events = mChatCore->getEventLogList();
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public:
|
|||
void setChatCore(QSharedPointer<ChatCore> core);
|
||||
void setChatGui(ChatGui *chat);
|
||||
|
||||
void connectItem(const QSharedPointer<EventLogCore> item);
|
||||
void connectItem(const QSharedPointer<EventLogCore> &item);
|
||||
|
||||
int findFirstUnreadIndex();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue