mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-22 19:14:52 +01:00
Code Issues Projects Releases Wiki Activity

Resolve promise on all code paths

Browse Source
This commit is contained in:
RMidhunSuresh 2023-05-15 22:05:24 +05:30
parent 4bed52aa58
commit 2ef934c39d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/matrix/room/BaseRoom.js
View File

@ -562,6 +562,7 @@ export class BaseRoom extends EventEmitter {
* We only return the timeline when it has completely loaded! * We only return the timeline when it has completely loaded!
*/ */
log.log({ l: "Returning existing timeline" }); log.log({ l: "Returning existing timeline" });
resolve();
return this._timeline; return this._timeline;
} }
this._timeline = new Timeline({ this._timeline = new Timeline({
@ -585,11 +586,12 @@ export class BaseRoom extends EventEmitter {
this._timeline.enableEncryption(this._decryptEntries.bind(this, DecryptionSource.Timeline)); this._timeline.enableEncryption(this._decryptEntries.bind(this, DecryptionSource.Timeline));
} }
await this._timeline.load(this._user, this.membership, log); await this._timeline.load(this._user, this.membership, log);
resolve();
} catch (err) { } catch (err) {
// this also clears this._timeline in the closeCallback // this also clears this._timeline in the closeCallback
this._timeline.dispose(); this._timeline.dispose();
throw err; throw err;
} finally {
resolve();
} }
return this._timeline; return this._timeline;
}); });