From 41737ac22c3689324e4296d6fdfc9677a86d70e6 Mon Sep 17 00:00:00 2001
From: Loren Burkholder <computersemiexpert@outlook.com>
Date: Tue, 2 Mar 2021 20:35:03 -0500
Subject: Simplify image loading

---
 src/notifications/ManagerMac.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/notifications/ManagerMac.cpp')

diff --git a/src/notifications/ManagerMac.cpp b/src/notifications/ManagerMac.cpp
index 1bf1577f..de5d0875 100644
--- a/src/notifications/ManagerMac.cpp
+++ b/src/notifications/ManagerMac.cpp
@@ -39,9 +39,9 @@ NotificationsManager::postNotification(const mtx::responses::Notification &notif
           cache::displayName(QString::fromStdString(notification.room_id),
                              QString::fromStdString(mtx::accessors::sender(notification.event)));
 
-        QImage *image = nullptr;
+        QImage image;
         if (mtx::accessors::msg_type(notification.event) == mtx::events::MessageType::Image)
-                image = getImgOrNullptr(cacheImage(notification.event));
+                image = QImage{cacheImage(notification.event)};
 
         const auto isEncrypted =
           std::get_if<mtx::events::EncryptedEvent<mtx::events::msg::Encrypted>>(
@@ -61,11 +61,3 @@ NotificationsManager::postNotification(const mtx::responses::Notification &notif
                   room_name, messageInfo, formatNotification(notification), image);
         }
 }
-
-QImage *
-NotificationsManager::getImgOrNullptr(const QString &path)
-{
-        if (QFile::exists(path))
-                return nullptr;
-        return new QImage{path};
-}
-- 
cgit 1.5.1