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

Fix loading custom.css from custom path

Browse Source
This commit is contained in:
Natsumi
2025-01-19 00:26:49 +13:00
parent 46a2fe36a9
commit 37a9688b81
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dotnet/AppApi/Cef/AppApiVr.cs
+1 -2
View File
@@ -75,8 +75,7 @@ namespace VRCX
public string CustomVrScriptPath() public string CustomVrScriptPath()
{ {
var output = string.Empty; var output = string.Empty;
var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "VRCX", var filePath = Path.Combine(Program.AppDataDirectory, "customvr.js");
"customvr.js");
if (File.Exists(filePath)) if (File.Exists(filePath))
output = filePath; output = filePath;
return output; return output;
Dotnet/AppApi/Common/AppApiCommon.cs
+2 -4
View File
@@ -83,8 +83,7 @@ namespace VRCX
public string CustomCssPath() public string CustomCssPath()
{ {
var output = string.Empty; var output = string.Empty;
var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "VRCX", var filePath = Path.Combine(Program.AppDataDirectory, "custom.css");
"custom.css");
if (File.Exists(filePath)) if (File.Exists(filePath))
output = filePath; output = filePath;
return output; return output;
@@ -93,8 +92,7 @@ namespace VRCX
public string CustomScriptPath() public string CustomScriptPath()
{ {
var output = string.Empty; var output = string.Empty;
var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "VRCX", var filePath = Path.Combine(Program.AppDataDirectory, "custom.js");
"custom.js");
if (File.Exists(filePath)) if (File.Exists(filePath))
output = filePath; output = filePath;
return output; return output;
src/app.js
+8 -1
View File
@@ -5459,6 +5459,10 @@ console.log(`isLinux: ${LINUX}`);
$app.data.dontLogMeOut = false; $app.data.dontLogMeOut = false;
API.$on('LOGIN', async function (args) { API.$on('LOGIN', async function (args) {
// early loading indicator
this.isRefreshFriendsLoading = true;
$app.feedTable.loading = true;
$app.friendLog = new Map(); $app.friendLog = new Map();
$app.feedTable.data = []; $app.feedTable.data = [];
$app.feedSessionTable = []; $app.feedSessionTable = [];
@@ -22254,7 +22258,10 @@ console.log(`isLinux: ${LINUX}`);
try { try {
var loggingEnabled = var loggingEnabled =
await this.getVRChatRegistryKey('LOGGING_ENABLED'); await this.getVRChatRegistryKey('LOGGING_ENABLED');
if (loggingEnabled === null) { if (
loggingEnabled === null ||
typeof loggingEnabled === 'undefined'
) {
// key not found // key not found
return; return;
} }