Commit a1802652 authored by Benjamin REIS's avatar Benjamin REIS

fix

parent 840117e4
......@@ -310,6 +310,8 @@ RemoteConference(core, me->getAddress(), nullptr) {
dConference->participants = move(participants);
getMe()->getPrivate()->setAdmin(me->isAdmin());
for (const auto &device : me->getPrivate()->getDevices())
getMe()->getPrivate()->addDevice(device->getAddress(), device->getName());
dConference->eventHandler->setConferenceId(conferenceId);
dConference->eventHandler->setLastNotify(lastNotifyId);
......
......@@ -2567,7 +2567,7 @@ list<shared_ptr<AbstractChatRoom>> MainDb::getChatRooms () const {
soci::rowset<soci::row> rows = (session->prepare << query, soci::use(participantId));
for (const auto &row : rows) {
shared_ptr<ParticipantDevice> device = dParticipant->addDevice(IdentityAddress(row.get<string>(0)), row.get<string>(2));
shared_ptr<ParticipantDevice> device = dParticipant->addDevice(IdentityAddress(row.get<string>(0)), row.get<string>(2, ""));
device->setState(ParticipantDevice::State(static_cast<unsigned int>(row.get<int>(1, 0))));
}
}
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment