fix: minimize the number of updates for lastIs.. and keep user prefer…

…ences that are set during presentation Signed-off-by: DorraJaouad <[email protected]>
nextcloud · May 13, 2024 · 59c39ff · 59c39ff
1 parent d047542
commit 59c39ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/components/TopBar/TopBarMenu.vue b/src/components/TopBar/TopBarMenu.vue
@@ -434,7 +434,7 @@ export default {
 		},
 
 		changeView() {
-			this.$store.dispatch('setCallViewMode', { isGrid: !this.isGrid })
+			this.$store.dispatch('setCallViewMode', { isGrid: !this.isGrid, clearLast: false })
 			this.$store.dispatch('selectedVideoPeerId', null)
 		},
 

diff --git a/src/store/callViewStore.js b/src/store/callViewStore.js
@@ -216,12 +216,15 @@ const actions = {
 		if (!context.getters.presentationStarted) {
 			return
 		}
-
-		// restore previous state
-		context.dispatch('setCallViewMode', {
-			isGrid: context.getters.lastIsGrid,
-			isStripeOpen: context.getters.lastIsStripeOpen,
-		})
+		if (!context.getters.isGrid && !context.getters.isStripeOpen) {
+			// User didn't pick grid view during presentation
+			// restore previous state
+			context.dispatch('setCallViewMode', {
+				isGrid: context.getters.lastIsGrid,
+				isStripeOpen: context.getters.lastIsStripeOpen,
+				clearLast: false,
+			})
+		}
 		context.commit('presentationStarted', false)
 	},