diff --git a/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingWaitingRoomFragment.kt b/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingWaitingRoomFragment.kt index 90d11cb4f..e6d906388 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingWaitingRoomFragment.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/fragment/MeetingWaitingRoomFragment.kt @@ -151,19 +151,20 @@ class MeetingWaitingRoomFragment : GenericMainFragment() { override fun onResume() { super.onResume() - if (isCameraPermissionGranted()) { - Log.i( - "$TAG Record video permission is granted, starting video preview with front cam if possible" - ) - viewModel.setFrontCamera() - enableVideoPreview() + if (viewModel.joining.value == false) { + if (isCameraPermissionGranted()) { + Log.i( + "$TAG Record video permission is granted, starting video preview with front cam if possible" + ) + viewModel.setFrontCamera() + enableVideoPreview() + } } } override fun onPause() { bottomSheetDialog?.dismiss() bottomSheetDialog = null - viewModel.joining.value = false coreContext.postOnCoreThread { core -> core.nativePreviewWindowId = null diff --git a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt index dcca85eed..ff8028eb8 100644 --- a/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt +++ b/app/src/main/java/org/linphone/ui/main/meetings/viewmodel/MeetingWaitingRoomViewModel.kt @@ -111,12 +111,10 @@ class MeetingWaitingRoomViewModel @UiThread constructor() : GenericViewModel() { Log.i("$TAG Call has ended, leaving waiting room fragment") leaveWaitingRoomEvent.postValue(Event(true)) } - Call.State.Error -> { Log.w("$TAG Call has failed, leaving waiting room fragment") leaveWaitingRoomEvent.postValue(Event(true)) } - else -> {} } }