From c613beed2e0c19c9c011edfb980268e0d4b20146 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 14 Feb 2018 11:55:38 +0100 Subject: [PATCH] Allow joining a ClientGroupChatRoom while it is being left. --- src/chat/chat-room/client-group-chat-room.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/chat/chat-room/client-group-chat-room.cpp b/src/chat/chat-room/client-group-chat-room.cpp index 36f583820..8064e8499 100644 --- a/src/chat/chat-room/client-group-chat-room.cpp +++ b/src/chat/chat-room/client-group-chat-room.cpp @@ -393,7 +393,10 @@ void ClientGroupChatRoom::join () { if (!session && ((getState() == ChatRoom::State::Instantiated) || (getState() == ChatRoom::State::Terminated))) { d->bgTask.start(); session = d->createSession(); - session->startInvite(nullptr, "", nullptr); + } + if (session) { + if (getState() != ChatRoom::State::TerminationPending) + session->startInvite(nullptr, "", nullptr); d->setState(ChatRoom::State::CreationPending); } }