ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash when accepting/declining already accepted/declined invite

Browse Source 
BUG: 475502
This commit is contained in:
Tobias Fella
2024-01-01 17:50:52 +01:00
parent c01e42c972
commit 4a809d57f7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/notificationsmanager.cpp
View File

@@ -235,8 +235,9 @@ void NotificationsManager::postNotification(NeoChatRoom *room,
notification->sendEvent(); notification->sendEvent();
} }
void NotificationsManager::postInviteNotification(NeoChatRoom *room, const QString &title, const QString &sender, const QImage &icon) void NotificationsManager::postInviteNotification(NeoChatRoom *rawRoom, const QString &title, const QString &sender, const QImage &icon)
{ {
QPointer room(rawRoom);
QPixmap img; QPixmap img;
img.convertFromImage(icon); img.convertFromImage(icon);
KNotification *notification = new KNotification(QStringLiteral("invite")); KNotification *notification = new KNotification(QStringLiteral("invite"));
@@ -246,6 +247,9 @@ void NotificationsManager::postInviteNotification(NeoChatRoom *room, const QStri
notification->setFlags(KNotification::Persistent); notification->setFlags(KNotification::Persistent);
auto defaultAction = notification->addDefaultAction(i18n("Open this invitation in NeoChat")); auto defaultAction = notification->addDefaultAction(i18n("Open this invitation in NeoChat"));
connect(defaultAction, &KNotificationAction::activated, this, [notification, room]() { connect(defaultAction, &KNotificationAction::activated, this, [notification, room]() {
if (!room) {
return;
}
WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken()); WindowController::instance().showAndRaiseWindow(notification->xdgActivationToken());
notification->close(); notification->close();
RoomManager::instance().enterRoom(room); RoomManager::instance().enterRoom(room);