From 6dc5e1177bb738779b810978226301ab263ef4a1 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Mon, 19 Jul 2021 11:44:39 -0400 Subject: [PATCH] fix(delete): fix deleting pins when deleting messages --- src/app/chat/views/messages.nim | 1 + ui/shared/ConfirmationDialog.qml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/chat/views/messages.nim b/src/app/chat/views/messages.nim index 7f5065a09c..c6da9cf5a0 100644 --- a/src/app/chat/views/messages.nim +++ b/src/app/chat/views/messages.nim @@ -422,6 +422,7 @@ QtObject: proc deleteMessage*(self: MessageView, channelId: string, messageId: string): bool = result = self.messageList[channelId].deleteMessage(messageId) if (result): + self.pinnedMessagesList[channelId].deleteMessage(messageId) self.hideMessage(messageId) proc deleteMessageWhichReplacedMessageWithId*(self: MessageView, channelId: string, messageId: string): bool = diff --git a/ui/shared/ConfirmationDialog.qml b/ui/shared/ConfirmationDialog.qml index cb6f83a229..8fc9eb61d0 100644 --- a/ui/shared/ConfirmationDialog.qml +++ b/ui/shared/ConfirmationDialog.qml @@ -87,8 +87,8 @@ ModalPopup { text: confirmationDialog.cancelButtonLabel anchors.bottom: parent.bottom onClicked: { - if (executeConfirm && typeof executeConfirm === "function") { - executeConfirm() + if (executeCancel && typeof executeCancel === "function") { + executeCancel() } confirmationDialog.cancelButtonClicked() }