Merge pull request 'only run osu updater when launcher pulled updates' (#4) from dev into master
Reviewed-on: #4
This commit is contained in:
commit
9f3c4d4fa4
47
main.js
47
main.js
|
@ -477,30 +477,31 @@ function registerIPCPipes() {
|
||||||
}
|
}
|
||||||
await new Promise((res) => setTimeout(res, 1000));
|
await new Promise((res) => setTimeout(res, 1000));
|
||||||
}
|
}
|
||||||
|
if (updateFiles.length > 0) {
|
||||||
mainWindow.webContents.send("ezpplauncher:launchstatus", {
|
mainWindow.webContents.send("ezpplauncher:launchstatus", {
|
||||||
status: "Launching osu! updater to verify...",
|
status: "Launching osu! updater to verify updates...",
|
||||||
});
|
|
||||||
await new Promise((res) => setTimeout(res, 1000));
|
|
||||||
|
|
||||||
await new Promise((res) => {
|
|
||||||
runOsuUpdater(osuPath, async () => {
|
|
||||||
await new Promise((res) => setTimeout(res, 500));
|
|
||||||
const terminationThread = setInterval(async () => {
|
|
||||||
const osuWindowTitle = windowName.getWindowText("osu!.exe");
|
|
||||||
if (osuWindowTitle.length < 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const firstInstance = osuWindowTitle[0];
|
|
||||||
if (firstInstance) {
|
|
||||||
const processId = firstInstance.processId;
|
|
||||||
await fkill(processId, { force: true, silent: true });
|
|
||||||
clearInterval(terminationThread);
|
|
||||||
res();
|
|
||||||
}
|
|
||||||
}, 500);
|
|
||||||
});
|
});
|
||||||
});
|
await new Promise((res) => setTimeout(res, 1000));
|
||||||
|
|
||||||
|
await new Promise((res) => {
|
||||||
|
runOsuUpdater(osuPath, async () => {
|
||||||
|
await new Promise((res) => setTimeout(res, 500));
|
||||||
|
const terminationThread = setInterval(async () => {
|
||||||
|
const osuWindowTitle = windowName.getWindowText("osu!.exe");
|
||||||
|
if (osuWindowTitle.length < 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const firstInstance = osuWindowTitle[0];
|
||||||
|
if (firstInstance) {
|
||||||
|
const processId = firstInstance.processId;
|
||||||
|
await fkill(processId, { force: true, silent: true });
|
||||||
|
clearInterval(terminationThread);
|
||||||
|
res();
|
||||||
|
}
|
||||||
|
}, 500);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
await new Promise((res) => setTimeout(res, 1000));
|
await new Promise((res) => setTimeout(res, 1000));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user