Merge pull request #11755 from nextcloud/backport/11726/stable28

[stable28] fix(CallView): enforce switching to Speaker view then select screenshares
nextcloud · Mar 8, 2024 · 0b2d68b · 0b2d68b
2 parents 1c42659 + 251d185
commit 0b2d68b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue
@@ -675,7 +675,15 @@ export default {
 				return
 			}
 
-			this.$store.dispatch('startPresentation')
+			if (this.$store.getters.presentationStarted) {
+				this.$store.dispatch('setCallViewMode', {
+					isGrid: false,
+					isStripeOpen: false,
+					clearLast: false,
+				})
+			} else {
+				this.$store.dispatch('startPresentation')
+			}
 			this.$store.dispatch('selectedVideoPeerId', null)
 			this.screens.splice(index, 1)
 			this.screens.unshift(id)

diff --git a/src/components/CallView/shared/VideoBottomBar.vue b/src/components/CallView/shared/VideoBottomBar.vue
@@ -271,7 +271,7 @@ export default {
 		},
 
 		switchToScreen() {
-			if (!this.sharedData.screenVisible) {
+			if (!this.sharedData.screenVisible || !this.isBig) {
 				emit('switch-screen-to-id', this.model.attributes.peerId)
 			}
 		},