adapt findOneToOneChatroom to both basic and clientGroup

47943bf8 · Benjamin REIS · fe8930ce · 47943bf8
Commit 47943bf8 authored Dec 22, 2017 by Benjamin REIS
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

src/core/core-chat-room.cpp src/core/core-chat-room.cpp +4 -2

No files found.
--- a/src/core/core-chat-room.cpp
+++ b/src/core/core-chat-room.cpp
@@ -172,8 +172,10 @@ shared_ptr<AbstractChatRoom> Core::findOneToOneChatRoom (
 	for (const auto &chatRoom : d->chatRooms) {
 		if (
 			chatRoom->getParticipantCount() == 1 &&
-			chatRoom->getLocalAddress() == localAddress &&
-			participantAddress == chatRoom->getParticipants().front()->getAddress()
+			(
+			 (chatRoom->getLocalAddress() == localAddress && participantAddress == chatRoom->getParticipants().front()->getAddress()) ||
+			 (chatRoom->getLocalAddress() == localAddress.getAddressWithoutGruu() && chatRoom->getPeerAddress() == participantAddress)
+			)
 		)
 			return chatRoom;
 	}