Skip to content
Extraits de code Groupes Projets
Vérifiée Valider ac431c9a rédigé par Kubat's avatar Kubat
Parcourir les fichiers

Don't use event.reply when not replying to an event, use win.webContents.send,...

Don't use event.reply when not replying to an event, use win.webContents.send, because this is what we actually do
parent 99c10522
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!12Config and signals refactor
...@@ -287,13 +287,11 @@ ipcMain.on('verify-lektord', (event, arg) => { ...@@ -287,13 +287,11 @@ ipcMain.on('verify-lektord', (event, arg) => {
setTimeout(() => lkt.idleActualisation(), 1000); setTimeout(() => lkt.idleActualisation(), 1000);
setTimeout(() => lkt.statusActualisation(), 1500); setTimeout(() => lkt.statusActualisation(), 1500);
setTimeout(() => db.queueAll().then(karas => event.reply('reload-queue-responce', karas)), 1000); setTimeout(() => db.queueAll().then(karas => win.webContents.send('reload-queue-responce', karas)), 1000);
setInterval(() => { setInterval(() => {
if (lkt.isQueueUpdated()) { if (lkt.isQueueUpdated()) {
lkt.setQueueUpdated(false); lkt.setQueueUpdated(false);
db.queueAll().then(karas => { db.queueAll().then(karas => win.webContents.send('reload-queue-responce', karas));
event.reply('reload-queue-responce', karas);
});
} }
}, 50); }, 50);
...@@ -301,7 +299,7 @@ ipcMain.on('verify-lektord', (event, arg) => { ...@@ -301,7 +299,7 @@ ipcMain.on('verify-lektord', (event, arg) => {
var newSongTimeData = lkt.getSongTimeData(); var newSongTimeData = lkt.getSongTimeData();
if (newSongTimeData.elapsed != songTimeData.elapsed || newSongTimeData.song != songTimeData.song) { if (newSongTimeData.elapsed != songTimeData.elapsed || newSongTimeData.song != songTimeData.song) {
songTimeData = newSongTimeData; songTimeData = newSongTimeData;
event.reply('send-song-time-data', { win.webContents.send('send-song-time-data', {
elapsed: songTimeData.elapsed, elapsed: songTimeData.elapsed,
total: songTimeData.total, total: songTimeData.total,
song: songTimeData.song, song: songTimeData.song,
...@@ -310,14 +308,14 @@ ipcMain.on('verify-lektord', (event, arg) => { ...@@ -310,14 +308,14 @@ ipcMain.on('verify-lektord', (event, arg) => {
counterTime = 0; counterTime = 0;
} else if (newSongTimeData.state == 'play') { } else if (newSongTimeData.state == 'play') {
counterTime++; counterTime++;
event.reply('send-song-time-data', { win.webContents.send('send-song-time-data', {
elapsed: songTimeData.elapsed + counterTime / 20.0, elapsed: songTimeData.elapsed + counterTime / 20.0,
total: songTimeData.total, total: songTimeData.total,
song: songTimeData.song, song: songTimeData.song,
state: songTimeData.state, state: songTimeData.state,
}); });
} else { } else {
event.reply('send-song-time-data', { win.webContents.send('send-song-time-data', {
elapsed: songTimeData.elapsed + counterTime / 20.0, elapsed: songTimeData.elapsed + counterTime / 20.0,
total: songTimeData.total, total: songTimeData.total,
song: songTimeData.song, song: songTimeData.song,
...@@ -329,7 +327,7 @@ ipcMain.on('verify-lektord', (event, arg) => { ...@@ -329,7 +327,7 @@ ipcMain.on('verify-lektord', (event, arg) => {
setInterval(() => { setInterval(() => {
isRunning({ win: 'klkt.exe', mac: 'klkt', linux: 'klkt' }).then(vklkt => { isRunning({ win: 'klkt.exe', mac: 'klkt', linux: 'klkt' }).then(vklkt => {
isRunning({ win: 'lektord.exe', mac: 'lektord', linux: 'lektord' }).then(vlektord => { isRunning({ win: 'lektord.exe', mac: 'lektord', linux: 'lektord' }).then(vlektord => {
event.reply('send-runnings', { win.webContents.send('send-runnings', {
klkt: vklkt, klkt: vklkt,
lektord: vlektord, lektord: vlektord,
}); });
...@@ -339,7 +337,7 @@ ipcMain.on('verify-lektord', (event, arg) => { ...@@ -339,7 +337,7 @@ ipcMain.on('verify-lektord', (event, arg) => {
setInterval(() => { setInterval(() => {
if (lkt.isStatusUpdated()) { if (lkt.isStatusUpdated()) {
event.reply('send-state', lkt.getStatus().state); win.webContents.send('send-state', lkt.getStatus().state);
} }
}, 50); }, 50);
}); });
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter