diff --git a/Dotnet/AppApi/Cef/AppApiVr.cs b/Dotnet/AppApi/Cef/AppApiVr.cs index 31fe5d21..7adfc950 100644 --- a/Dotnet/AppApi/Cef/AppApiVr.cs +++ b/Dotnet/AppApi/Cef/AppApiVr.cs @@ -75,8 +75,7 @@ namespace VRCX public string CustomVrScriptPath() { var output = string.Empty; - var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "VRCX", - "customvr.js"); + var filePath = Path.Combine(Program.AppDataDirectory, "customvr.js"); if (File.Exists(filePath)) output = filePath; return output; diff --git a/Dotnet/AppApi/Common/AppApiCommon.cs b/Dotnet/AppApi/Common/AppApiCommon.cs index d789b0db..12e98a20 100644 --- a/Dotnet/AppApi/Common/AppApiCommon.cs +++ b/Dotnet/AppApi/Common/AppApiCommon.cs @@ -83,8 +83,7 @@ namespace VRCX public string CustomCssPath() { var output = string.Empty; - var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "VRCX", - "custom.css"); + var filePath = Path.Combine(Program.AppDataDirectory, "custom.css"); if (File.Exists(filePath)) output = filePath; return output; @@ -93,8 +92,7 @@ namespace VRCX public string CustomScriptPath() { var output = string.Empty; - var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "VRCX", - "custom.js"); + var filePath = Path.Combine(Program.AppDataDirectory, "custom.js"); if (File.Exists(filePath)) output = filePath; return output; diff --git a/src/app.js b/src/app.js index 570d1915..127b9c6c 100644 --- a/src/app.js +++ b/src/app.js @@ -5459,6 +5459,10 @@ console.log(`isLinux: ${LINUX}`); $app.data.dontLogMeOut = false; API.$on('LOGIN', async function (args) { + // early loading indicator + this.isRefreshFriendsLoading = true; + $app.feedTable.loading = true; + $app.friendLog = new Map(); $app.feedTable.data = []; $app.feedSessionTable = []; @@ -22254,7 +22258,10 @@ console.log(`isLinux: ${LINUX}`); try { var loggingEnabled = await this.getVRChatRegistryKey('LOGGING_ENABLED'); - if (loggingEnabled === null) { + if ( + loggingEnabled === null || + typeof loggingEnabled === 'undefined' + ) { // key not found return; }