PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix possible infinite loop on widget start (#7071)

Browse source 
* fix 15494 infinit loop on widget start error

* change message to error from log
and fix block style
This commit is contained in:
Timo 2021-11-04 11:36:20 +01:00 committed by GitHub
parent c18c66f4ed
commit 558a6204f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/views/elements/AppTile.tsx
View file

@ -227,7 +227,7 @@ export default class AppTile extends React.Component<IProps, IState> {
this.sgWidget.on("ready", this.onWidgetReady); this.sgWidget.on("ready", this.onWidgetReady);
this.startWidget(); this.startWidget();
} catch (e) { } catch (e) {
logger.log("Failed to construct widget", e); logger.error("Failed to construct widget", e);
this.sgWidget = null; this.sgWidget = null;
} }
} }
@ -241,7 +241,13 @@ export default class AppTile extends React.Component<IProps, IState> {
private iframeRefChange = (ref: HTMLIFrameElement): void => { private iframeRefChange = (ref: HTMLIFrameElement): void => {
this.iframe = ref; this.iframe = ref;
if (ref) { if (ref) {
if (this.sgWidget) this.sgWidget.start(ref); try {
if (this.sgWidget) {
this.sgWidget.start(ref);
}
} catch (e) {
logger.error("Failed to start widget", e);
}
} else { } else {
this.resetWidget(this.props); this.resetWidget(this.props);
} }