Merge pull request #6909 from matrix-org/t3chguy/fix/19255

t3chguy · web-flow · commit a51847e50aad · 2021-10-06T13:25:03.000+01:00
diff --git a/src/stores/SpaceStore.ts b/src/stores/SpaceStore.ts
@@ -793,7 +793,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {
                 // 1 is Home, 2-9 are the spaces after Home
                 if (payload.num === 1) {
                     this.setActiveSpace(null);
-                } else if (this.spacePanelSpaces.length >= payload.num) {
+                } else if (payload.num > 0 && this.spacePanelSpaces.length > payload.num - 2) {
                     this.setActiveSpace(this.spacePanelSpaces[payload.num - 2]);
                 }
                 break;

Original file line number	Diff line number	Diff line change
`@@ -793,7 +793,7 @@ export class SpaceStoreClass extends AsyncStoreWithClient<IState> {`
`793`	`793`	`// 1 is Home, 2-9 are the spaces after Home`
`794`	`794`	`if (payload.num === 1) {`
`795`	`795`	`this.setActiveSpace(null);`
`796`		`- } else if (this.spacePanelSpaces.length >= payload.num) {`
	`796`	`+ } else if (payload.num > 0 && this.spacePanelSpaces.length > payload.num - 2) {`
`797`	`797`	`this.setActiveSpace(this.spacePanelSpaces[payload.num - 2]);`
`798`	`798`	`}`
`799`	`799`	`break;`