From 3d85eda40686bfc4f3e13b71bc159eb0722bc9e3 Mon Sep 17 00:00:00 2001 From: Xavier O'Neil Date: Tue, 2 May 2017 13:23:36 -0400 Subject: [PATCH] RUN-2934 try/catch the call the getAllWindows (#116) --- .../api/notifications/subscriptions.ts | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/browser/api/notifications/subscriptions.ts b/src/browser/api/notifications/subscriptions.ts index 59722f437..1bd66df60 100644 --- a/src/browser/api/notifications/subscriptions.ts +++ b/src/browser/api/notifications/subscriptions.ts @@ -166,22 +166,26 @@ ofEvents.on('application/window-end-load/*', (e: any) => { seqs.requestNoteClose .subscribe((req: NotificationMessage) => { - const noteIsOpen = windowIsValid(req.id); + try { + const noteIsOpen = windowIsValid(req.id); - if (noteIsOpen) { - const ns = getCurrNotes(); - const mousePos = System.getMousePosition(); - const monitorInfo = getPrimaryMonitorAvailableRect(); - const mouseOver = mouseisOverNotes(mousePos, monitorInfo, ns.length); + if (noteIsOpen) { + const ns = getCurrNotes(); + const mousePos = System.getMousePosition(); + const monitorInfo = getPrimaryMonitorAvailableRect(); + const mouseOver = mouseisOverNotes(mousePos, monitorInfo, ns.length); - if (!mouseOver || req.data.force) { - closeNotification(req); + if (!mouseOver || req.data.force) { + closeNotification(req); + } else { + scheduleNoteClose(req, 1000); + } } else { - scheduleNoteClose(req, 1000); + removePendingNote(req.id); } - } else { - removePendingNote(req.id); + } catch (e) { + writeToLog('info', e); } });