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

Fix a crash when removing persistent widgets (updated) #10099

Merged
merged 3 commits into from
Feb 7, 2023
Merged

Fix a crash when removing persistent widgets (updated) #10099

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9354f61
Fix a crash when removing persistent widgets
robintown Feb 2, 2023
12c70c6
Re-public updateShowWidgetInPip so we don't change the interface
andybalaam Feb 7, 2023
4c3dbf1
Merge branch 'develop' into robintown/remove-widget-crash
andybalaam Feb 7, 2023
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
14 changes: 5 additions & 9 deletions src/components/structures/PipContainer.tsx
View file
Open in desktop
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