Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't even try to restore last url when in single room mode #196

Merged
merged 1 commit into from
Mar 7, 2023
Merged

Don't even try to restore last url when in single room mode #196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions frontend/iframe/viewmodels/RootViewModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export class RootViewModel extends ViewModel<SegmentType, Options> {
}

public get singleRoomMode(): boolean {
return !!this._resolvedSingleRoomId;
return !!this._singleRoomIdOrAlias;
}

public async start() {
Expand Down Expand Up @@ -157,7 +157,8 @@ export class RootViewModel extends ViewModel<SegmentType, Options> {
}
} else {
try {
if (!(shouldRestoreLastUrl && this.urlRouter.tryRestoreLastUrl())) {
// don't even try to restore last url when in single room mode
if (this.singleRoomMode || !(shouldRestoreLastUrl && this.urlRouter.tryRestoreLastUrl())) {
const sessionInfos = await this.platform.sessionInfoStorage.getAll();
if (sessionInfos.length === 0) {
this.navigation.push(Section.Login);
Expand Down