From 5069a4a5085792e6303b1e0208ba24cd64408a6d Mon Sep 17 00:00:00 2001
From: Benjamin Reis <benjamin.reis@belledonne-communications.com>
Date: Mon, 27 Nov 2017 12:20:11 +0100
Subject: [PATCH] use coreect address for 'me' and initiate chat room times
 with now

---
 src/chat/chat-room/chat-room-p.h | 4 ++--
 src/db/main-db.cpp               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/chat/chat-room/chat-room-p.h b/src/chat/chat-room/chat-room-p.h
index 853c2f557..e3d5d05b7 100644
--- a/src/chat/chat-room/chat-room-p.h
+++ b/src/chat/chat-room/chat-room-p.h
@@ -90,8 +90,8 @@ public:
 
 	ChatRoomId chatRoomId;
 
-	time_t creationTime = -1;
-	time_t lastUpdateTime = -1;
+	time_t creationTime = std::time(nullptr);
+	time_t lastUpdateTime = std::time(nullptr);
 
 private:
 	L_DECLARE_PUBLIC(ChatRoom);
diff --git a/src/db/main-db.cpp b/src/db/main-db.cpp
index 198e1b971..d48ecf95d 100644
--- a/src/db/main-db.cpp
+++ b/src/db/main-db.cpp
@@ -1581,7 +1581,7 @@ MainDb::MainDb (const shared_ptr<Core> &core) : AbstractDb(*new MainDbPrivate),
 					shared_ptr<Participant> participant = make_shared<Participant>(IdentityAddress(row.get<string>(0)));
 					participant->getPrivate()->setAdmin(!!row.get<int>(1));
 
-					if (participant->getAddress() == chatRoomId.getPeerAddress())
+					if (participant->getAddress() == chatRoomId.getLocalAddress())
 						me = participant;
 					else
 						participants.push_back(participant);