zedcode/bs-manager
1
0
Fork 0
mirror of https://github.com/Zagrios/bs-manager.git synced 2026-07-03 14:08:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #182 from Zagrios/hotfix/steamvr-restore-conflict-on-fast-bs-reboot

Browse Source 
[hotfix] steamvr restoration conflict on fast bs reboot
This commit is contained in:
MathieuG-P
2023-03-15 16:23:44 +01:00
committed by GitHub
parent 18f2f18e41 4cce24e275
commit da8bae8582
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/services/bs-launcher.service.ts
+8 -6
View File
@@ -41,14 +41,15 @@ export class BSLauncherService{
private async backupSteamVR(): Promise<void>{
const steamVrFolder = await this.getSteamVRPath();
if(!await pathExist(steamVrFolder)){ return; }
return rename(steamVrFolder, steamVrFolder + ".bak");
return rename(steamVrFolder, steamVrFolder + ".bak").catch(log.error);
}
public async restoreSteamVR(): Promise<void>{
console.log("restoreSteamVR");
const steamVrFolder = await this.getSteamVRPath();
const steamVrBackup = steamVrFolder + ".bak";
if(!await pathExist(steamVrBackup)){ return; }
return rename(steamVrFolder + ".bak", steamVrFolder);
return rename(steamVrFolder + ".bak", steamVrFolder).catch(log.error);
}
public isBsRunning(): boolean{
@@ -75,12 +76,13 @@ export class BSLauncherService{
launchArgs = Array.from(new Set(launchArgs).values());
let restoreTimout: NodeJS.Timeout;
if(launchArgs.includes("fpfc")){
await this.backupSteamVR().catch(e => {
log.error(e);
await this.backupSteamVR().catch(() => {
this.restoreSteamVR();
}).finally(() => {
setTimeout(() => this.restoreSteamVR(), 35_000);
restoreTimout = setTimeout(() => this.restoreSteamVR(), 35_000);
});
await timer(2_000).toPromise();
}
@@ -97,7 +99,7 @@ export class BSLauncherService{
this.bsProcess.on('error', err => log.error(err));
this.bsProcess.on('exit', code => {
this.restoreSteamVR();
this.restoreSteamVR().finally(() => clearTimeout(restoreTimout));
this.utilsService.ipcSend("bs-launch.exit", {data: code, success: code === 0})
});