1
0
Fork 0
mirror of https://gitlab.com/futo-org/fcast.git synced 2025-06-24 21:25:23 +00:00

Merge branch 'fix-device-info-race-condition' into 'master'

Fix code in onDeviceInfo not always being ran

Closes #3

See merge request futo-org/fcast!2
This commit is contained in:
Koen 2024-04-03 17:23:11 +00:00
commit 73de0107f1
2 changed files with 19 additions and 5 deletions

View file

@ -1,5 +1,11 @@
const { contextBridge, ipcRenderer } = require('electron');
let deviceInfo;
ipcRenderer.on("device-info", (_event, value) => {
deviceInfo = value;
})
contextBridge.exposeInMainWorld('electronAPI', {
onDeviceInfo: (callback) => ipcRenderer.on("device-info", callback)
});
onDeviceInfo: (callback) => ipcRenderer.on("device-info", callback),
getDeviceInfo: () => deviceInfo,
});

View file

@ -10,8 +10,16 @@ const player = videojs("video-player", options, function onPlayerReady() {
});
window.electronAPI.onDeviceInfo((_event, value) => {
console.log("onDeviceInfo", value);
window.electronAPI.onDeviceInfo(renderIPsAndQRCode);
if(window.electronAPI.getDeviceInfo()) {
console.log("device info already present");
renderIPsAndQRCode();
}
function renderIPsAndQRCode() {
const value = window.electronAPI.getDeviceInfo();
console.log("device info", value);
const ipsElement = document.getElementById('ips');
if (ipsElement) {
@ -42,4 +50,4 @@ window.electronAPI.onDeviceInfo((_event, value) => {
colorLight : "#ffffff",
correctLevel : QRCode.CorrectLevel.M
});
});
}