From c5461b4509bf7c309be75f7b7d9cc8aa602f4402 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 30 May 2019 20:04:16 -0600
Subject: [PATCH] Don't try and render null avatars in desktop notifications

as much fun as http://localhost:8080/null is to see
---
 src/vector/platform/ElectronPlatform.js | 14 ++++++--------
 src/vector/platform/WebPlatform.js      | 16 +++++++---------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js
index fcab36ac399..04f472d6455 100644
--- a/src/vector/platform/ElectronPlatform.js
+++ b/src/vector/platform/ElectronPlatform.js
@@ -141,14 +141,12 @@ export default class ElectronPlatform extends VectorBasePlatform {
         }
 
         // Notifications in Electron use the HTML5 notification API
-        const notification = new global.Notification(
-            title,
-            {
-                body: msg,
-                icon: avatarUrl,
-                silent: true, // we play our own sounds
-            },
-        );
+        const notifBody = {
+            body: msg,
+            silent: true, // we play our own sounds
+        };
+        if (avatarUrl) notifBody['icon'] = avatarUrl;
+        const notification = new global.Notification(title, notifBody);
 
         notification.onclick = () => {
             dis.dispatch({
diff --git a/src/vector/platform/WebPlatform.js b/src/vector/platform/WebPlatform.js
index d850dd6ddd5..984aa8da3ad 100644
--- a/src/vector/platform/WebPlatform.js
+++ b/src/vector/platform/WebPlatform.js
@@ -76,15 +76,13 @@ export default class WebPlatform extends VectorBasePlatform {
     }
 
     displayNotification(title: string, msg: string, avatarUrl: string, room: Object) {
-        const notification = new global.Notification(
-            title,
-            {
-                body: msg,
-                icon: avatarUrl,
-                tag: "vector",
-                silent: true, // we play our own sounds
-            },
-        );
+        const notifBody = {
+            body: msg,
+            tag: "vector",
+            silent: true, // we play our own sounds
+        };
+        if (avatarUrl) notifBody['icon'] = avatarUrl;
+        const notification = new global.Notification(title, notifBody);
 
         notification.onclick = function() {
             dis.dispatch({