Merge pull request #11726 from nextcloud/fix/noid/toggle-screen-shares

fix(CallView): enforce switching to Speaker view then select screenshares
nextcloud · Mar 8, 2024 · 0be58c6 · 0be58c6
2 parents 2fe9ad6 + e5c4905
commit 0be58c6
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
@@ -647,7 +647,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
@@ -273,7 +273,7 @@ export default {
 		},
 
 		switchToScreen() {
-			if (!this.sharedData.screenVisible) {
+			if (!this.sharedData.screenVisible || !this.isBig) {
 				emit('switch-screen-to-id', this.model.attributes.peerId)
 			}
 		},