OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1067 from matrix-org/luke/fix-forgetting-last-room 

Goto /home when forgetting the last room
pull/21833/head
David Baker 2017-06-09 11:03:14 +01:00 committed by GitHub
parent ce88d5c1cf 19bb879fbf
commit 924c08b143
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/structures/MatrixChat.js
View File

@ -570,6 +570,15 @@ module.exports = React.createClass({
const allRooms = RoomListSorter.mostRecentActivityFirst( const allRooms = RoomListSorter.mostRecentActivityFirst(
MatrixClientPeg.get().getRooms(), MatrixClientPeg.get().getRooms(),
); );
// If there are 0 rooms or 1 room, view the home page because otherwise
// if there are 0, we end up trying to index into an empty array, and
// if there is 1, we end up viewing the same room.
if (allRooms.length < 2) {
dis.dispatch({
action: 'view_home_page',
});
return;
}
let roomIndex = -1; let roomIndex = -1;
for (let i = 0; i < allRooms.length; ++i) { for (let i = 0; i < allRooms.length; ++i) {
if (allRooms[i].roomId == this.state.currentRoomId) { if (allRooms[i].roomId == this.state.currentRoomId) {