From 6675571aaf552ccfae5a816cb7170a42408b2a7f Mon Sep 17 00:00:00 2001 From: rafael-aero Date: Wed, 13 Apr 2022 20:51:34 +0200 Subject: [PATCH] handle fail on getdisplaymatching --- ElectronNET.Host/api/screen.js | 6 +++++- ElectronNET.Host/api/screen.ts | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ElectronNET.Host/api/screen.js b/ElectronNET.Host/api/screen.js index 2c9801d..0f2dc05 100644 --- a/ElectronNET.Host/api/screen.js +++ b/ElectronNET.Host/api/screen.js @@ -42,7 +42,11 @@ module.exports = (socket) => { electronSocket.emit('screen-getDisplayNearestPointCompleted', display); }); socket.on('screen-getDisplayMatching', (rectangle) => { - const display = electron_1.screen.getDisplayMatching(rectangle); + try { + display = electron_1.screen.getDisplayMatching(rectangle); + } catch { + display = electron_1.screen.getPrimaryDisplay(); + } electronSocket.emit('screen-getDisplayMatchingCompleted', display); }); }; diff --git a/ElectronNET.Host/api/screen.ts b/ElectronNET.Host/api/screen.ts index 30c3f41..acd9283 100644 --- a/ElectronNET.Host/api/screen.ts +++ b/ElectronNET.Host/api/screen.ts @@ -52,7 +52,12 @@ export = (socket: Socket) => { }); socket.on('screen-getDisplayMatching', (rectangle) => { - const display = screen.getDisplayMatching(rectangle); + let display; + try { + display = screen.getDisplayMatching(rectangle); + } catch { + display = screen.getPrimaryDisplay(); + } electronSocket.emit('screen-getDisplayMatchingCompleted', display); }); };