From c5cfbc58929d45916009ff4ba3758dd879965345 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Wed, 6 Dec 2017 14:23:03 +0100 Subject: [PATCH] do not increment lastNotify on a full state --- src/conference/handlers/local-conference-event-handler-p.h | 2 +- src/conference/handlers/local-conference-event-handler.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conference/handlers/local-conference-event-handler-p.h b/src/conference/handlers/local-conference-event-handler-p.h index 24f65b2cc..e5ffea9d9 100644 --- a/src/conference/handlers/local-conference-event-handler-p.h +++ b/src/conference/handlers/local-conference-event-handler-p.h @@ -52,7 +52,7 @@ private: ChatRoomId chatRoomId; LocalConference *conf = nullptr; - unsigned int lastNotify = 0; + unsigned int lastNotify = 1; std::string createNotify (Xsd::ConferenceInfo::ConferenceType confInfo, int notifyId = -1, bool isFullState = false); std::string createNotifySubjectChanged (const std::string &subject, int notifyId = -1); diff --git a/src/conference/handlers/local-conference-event-handler.cpp b/src/conference/handlers/local-conference-event-handler.cpp index 184047002..cdfa9e304 100644 --- a/src/conference/handlers/local-conference-event-handler.cpp +++ b/src/conference/handlers/local-conference-event-handler.cpp @@ -389,7 +389,7 @@ void LocalConferenceEventHandler::subscribeReceived (LinphoneEvent *lev) { device->setConferenceSubscribeEvent(lev); if (lastNotify == 0) { lInfo() << "Sending initial notify of conference:" << d->conf->getConferenceAddress().asString() << " to: " << device->getAddress().asString(); - d->notifyFullState(d->createNotifyFullState(), device); + d->notifyFullState(d->createNotifyFullState(static_cast(d->lastNotify)), device); } else if (lastNotify < d->lastNotify) { lInfo() << "Sending all missed notify [" << lastNotify << "-" << d->lastNotify << "] for conference:" << d->conf->getConferenceAddress().asString() <<