mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

showLightboxForMedia: Properly handle message events

Browse source
This commit is contained in:
Scott Nonnenberg 2022-10-24 17:56:51 -07:00 committed by GitHub
parent 0134990275
commit 4f3280b415
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ts/views/conversation_view.tsx
View file

@ -1738,8 +1738,21 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
mediaItem.attachment.path === selectedMediaItem.attachment.path
);
const mediaMessage = selectedMediaItem.message;
const message = window.MessageController.getById(mediaMessage.id);
if (!message) {
throw new Error(
`showLightboxForMedia: Message ${mediaMessage.id} missing!`
);
}
const close = () => {
closeLightbox();
this.stopListening(message, 'expired', closeLightbox);
};
showLightbox({
close: closeLightbox,
close,
i18n: window.i18n,
getConversation: getConversationSelector(window.reduxStore.getState()),
media,
@ -1749,6 +1762,8 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
onSave,
selectedIndex: selectedIndex >= 0 ? selectedIndex : 0,
});
this.listenTo(message, 'expired', close);
}
showLightbox({