diff --git a/coreapi/remote_conference.cpp b/coreapi/remote_conference.cpp index 175e8c4067a04760ff3b52b9e872106cf248a342..09d5f72f213b5ffeae78196e2bc6f672143cfb09 100644 --- a/coreapi/remote_conference.cpp +++ b/coreapi/remote_conference.cpp @@ -1040,11 +1040,11 @@ void RemoteConference::onPendingCallStateChanged(std::shared_ptr<LinphonePrivate if (((focusCallState == CallSession::State::StreamsRunning) || (focusCallState == CallSession::State::Connected) || (focusCallState == CallSession::State::UpdatedByRemote)) && - ((getState() == ConferenceInterface::State::CreationPending) || + ((state == ConferenceInterface::State::CreationPending) || (state == ConferenceInterface::State::Created))) { // Transfer call only if focus call remote contact address is available (i.e. the call has been // correctly established and passed through state StreamsRunning) - if (!session->getRemoteContactAddress()) { + if (session->getRemoteContactAddress()) { m_pendingCalls.remove(call); transferToFocus(call); } diff --git a/tester/audio_video_conference_tester.c b/tester/audio_video_conference_tester.c index d024c33517f235c214ed84ea770bf06a5821dadf..9ae4d222972ea4f2a5122c0b0dec7798f488cc4d 100644 --- a/tester/audio_video_conference_tester.c +++ b/tester/audio_video_conference_tester.c @@ -945,6 +945,9 @@ static void simple_conference_notify_speaking_device(void) { initial_laure_stat.number_of_LinphoneCallStreamsRunning + 1, 2000)); BC_ASSERT_TRUE(wait_for_list(lcs, &marie->stat.number_of_LinphoneCallStreamsRunning, initial_marie_stat.number_of_LinphoneCallStreamsRunning + 2, 3000)); + BC_ASSERT_FALSE(wait_for_list(lcs, &laure->stat.number_of_LinphoneCallPausedByRemote, + initial_laure_stat.number_of_LinphoneCallPausedByRemote + 1, 2000)); + BC_ASSERT_EQUAL(laure->stat.number_of_LinphoneCallPausedByRemote, 0, int, "%d"); // Set Laure is_speaking callback for all participants to check that pauline is speaking LinphoneConference *laure_conf = linphone_call_get_conference(linphone_core_get_current_call(laure->lc)); diff --git a/tester/group_chat_tester.c b/tester/group_chat_tester.c index 9ffd387d2f52102c8c415f09719943fece962a47..2b75aa91e52a5f4655838da27ae30929f7eb7429 100644 --- a/tester/group_chat_tester.c +++ b/tester/group_chat_tester.c @@ -8977,7 +8977,7 @@ static void group_chat_room_message_sync_between_devices_with_same_identity(void test_t group_chat_tests[] = { TEST_NO_TAG("Chat room params", group_chat_room_params), - TEST_NO_TAG("Core restarts as soon as chat room is created", group_chat_room_creation_core_restart), + TEST_ONE_TAG("Core restarts as soon as chat room is created", group_chat_room_creation_core_restart, "LeaksMemory"), TEST_NO_TAG("Chat room with forced local identity", group_chat_room_creation_with_given_identity), TEST_NO_TAG("Group chat room creation server", group_chat_room_creation_server), TEST_NO_TAG("Network down while creating group chat room", group_chat_room_creation_server_network_down),