MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-22 16:23:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: kill install process after exiting game (#864)

Browse Source 
* feat: kill install process after exiting game

* Restore en.json

* fix some key incorrect

* gui: update for VRChat OSC Fix

* fix: may incorrectly kill unrelated processes

* fix: pattern incorrect
This commit is contained in:
RingLo_
2024-08-07 16:54:39 +08:00
committed by GitHub
parent c3f4771f4d
commit 6465dc0910
4 changed files with 81 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
html/src/app.js
View File

@@ -11246,27 +11246,44 @@ speechSynthesis.getVoices();
database.addGamelogEventToDatabase(entry);
break;
case 'vrc-quit':
if (!this.vrcQuitFix || !this.isGameRunning) {
if (!this.isGameRunning) {
break;
}
var bias = Date.parse(gameLog.dt) + 3000;
if (bias < Date.now()) {
console.log('QuitFix: Bias too low, not killing VRC');
break;
}
AppApi.QuitGame().then((processCount) => {
if (processCount > 1) {
console.log(
'QuitFix: More than 1 process running, not killing VRC'
);
} else if (processCount === 1) {
console.log('QuitFix: Killed VRC');
} else {
console.log(
'QuitFix: Nothing to kill, no VRC process running'
);
if (this.vrcQuitFix) {
var bias = Date.parse(gameLog.dt) + 3000;
if (bias < Date.now()) {
console.log('QuitFix: Bias too low, not killing VRC');
break;
}
});
AppApi.QuitGame().then((processCount) => {
if (processCount > 1) {
console.log(
'QuitFix: More than 1 process running, not killing VRC'
);
} else if (processCount === 1) {
console.log('QuitFix: Killed VRC');
} else {
console.log(
'QuitFix: Nothing to kill, no VRC process running'
);
}
});
}
if (this.vrcOSCFix) {
setTimeout(() => {
AppApi.KillInstall().then((processKilled) => {
if (processKilled) {
console.log(
'OSCFix: Killed Install.exe'
);
} else {
console.log(
'OSCFix: Nothing to kill, no Install.exe process running'
);
}
});
}, 2000);
}
break;
case 'openvr-init':
this.isGameNoVR = false;
@@ -15394,6 +15411,10 @@ speechSynthesis.getVoices();
'VRCX_vrcQuitFix',
true
);
$app.data.vrcOSCFix = await configRepository.getBool(
'VRCX_vrcOSCFix',
true
);
$app.data.vrBackgroundEnabled = await configRepository.getBool(
'VRCX_vrBackgroundEnabled',
false
@@ -15573,6 +15594,7 @@ speechSynthesis.getVoices();
this.relaunchVRChatAfterCrash
);
await configRepository.setBool('VRCX_vrcQuitFix', this.vrcQuitFix);
await configRepository.setBool('VRCX_vrcOSCFix', this.vrcOSCFix);
await configRepository.setBool(
'VRCX_vrBackgroundEnabled',
this.vrBackgroundEnabled

4
html/src/localization/en/en.json
View File

@@ -424,6 +424,10 @@
"header": "VRChat Quit Fix",
"description": "Kill VRChat after exiting game"
},
"vrchat_osc_fix": {
"header": "VRChat OSC Fix",
"description": "Kill install process after exiting game"
},
"auto_cache_management": {
"header": "Automatically Manage Cache When Closing VRChat",
"description": "Auto delete old versions from cache"

5
html/src/mixins/tabs/settings.pug
View File

@@ -443,6 +443,11 @@ mixin settingsTab()
div.options-container-item
span.name(style="min-width:300px") {{ $t('view.settings.advanced.advanced.vrchat_quit_fix.description') }}
el-switch(v-model="vrcQuitFix" @change="saveOpenVROption")
//- Advanced | VRChat OSC Fix
span.sub-header {{ $t('view.settings.advanced.advanced.vrchat_osc_fix.header') }}
div.options-container-item
span.name(style="min-width:300px") {{ $t('view.settings.advanced.advanced.vrchat_osc_fix.description') }}
el-switch(v-model="vrcOSCFix" @change="saveOpenVROption")
//- Advanced | Auto Cache Management
span.sub-header {{ $t('view.settings.advanced.advanced.auto_cache_management.header') }}
div.options-container-item