Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Fix a crash when removing persistent widgets (updated) (#10099)
Browse files Browse the repository at this point in the history
* Fix a crash when removing persistent widgets

When a persistent widget is removed, multiple calls to updateShowWidgetInPip happen in succession as each of the widget stores emit updates. But by depending on this.state.persistentWidgetId at the time of the call rather than passing an update function to setState, this had the effect that the removal of the widget could be reverted in the component's state, and so it could end up passing the ID of a removed widget to WidgetPip.

* Re-public updateShowWidgetInPip so we don't change the interface

---------

Co-authored-by: Robin Townsend <robin@robin.town>
  • Loading branch information
andybalaam and robintown authored Feb 7, 2023
1 parent 14e5ffb commit da2471f
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions src/components/structures/PipContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,7 @@ class PipContainerInner extends React.Component<IProps, IState> {
};

private onWidgetPersistence = (): void => {
this.updateShowWidgetInPip(
ActiveWidgetStore.instance.getPersistentWidgetId(),
ActiveWidgetStore.instance.getPersistentRoomId(),
);
this.updateShowWidgetInPip();
};

private onWidgetDockChanges = (): void => {
Expand Down Expand Up @@ -234,11 +231,10 @@ class PipContainerInner extends React.Component<IProps, IState> {
}
};

// Accepts a persistentWidgetId to be able to skip awaiting the setState for persistentWidgetId
public updateShowWidgetInPip(
persistentWidgetId = this.state.persistentWidgetId,
persistentRoomId = this.state.persistentRoomId,
): void {
public updateShowWidgetInPip(): void {
const persistentWidgetId = ActiveWidgetStore.instance.getPersistentWidgetId();
const persistentRoomId = ActiveWidgetStore.instance.getPersistentRoomId();

let fromAnotherRoom = false;
let notDocked = false;
// Sanity check the room - the widget may have been destroyed between render cycles, and
Expand Down

0 comments on commit da2471f

Please sign in to comment.