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

Random fixes

Browse Source
This commit is contained in:
Natsumi
2025-10-20 13:22:22 +11:00
parent b4cafe2f3d
commit 97ef396ec9
16 changed files with 79 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Dotnet/AppApi/Electron/Folders.cs
View File

@@ -30,19 +30,24 @@ namespace VRCX
_steamPath = Path.Join(_homeDirectory, ".local/share/Steam");
var flatpakSteamPath = Path.Join(_homeDirectory, ".var/app/com.valvesoftware.Steam/.local/share/Steam");
if (!Directory.Exists(_steamPath) && Directory.Exists(flatpakSteamPath))
if (!IsValidSteamPath(_steamPath) && IsValidSteamPath(flatpakSteamPath))
{
logger.Info("Flatpak Steam detected.");
_steamPath = flatpakSteamPath;
}
var legacySteamPath = Path.Join(_homeDirectory, ".steam/steam");
if (!Directory.Exists(_steamPath) && Directory.Exists(legacySteamPath))
if (!IsValidSteamPath(_steamPath) && IsValidSteamPath(legacySteamPath))
{
logger.Info("Legacy Steam path detected.");
_steamPath = legacySteamPath;
}
if (!IsValidSteamPath(_steamPath))
{
logger.Error("No valid Steam library found.");
}
var libraryFoldersVdfPath = Path.Join(_steamPath, "config/libraryfolders.vdf");
var vrcLibraryPath = GetLibraryWithAppId(libraryFoldersVdfPath, vrchatAppid);
if (string.IsNullOrEmpty(vrcLibraryPath))
@@ -55,6 +60,11 @@ namespace VRCX
_vrcAppDataPath = Path.Join(_vrcPrefixPath, "drive_c/users/steamuser/AppData/LocalLow/VRChat/VRChat");
_vrcCrashesPath = Path.Join(_vrcPrefixPath, "drive_c/users/steamuser/AppData/Local/Temp/VRChat/VRChat/Crashes");
}
private static bool IsValidSteamPath(string path)
{
return File.Exists(Path.Join(path, "config/libraryfolders.vdf"));
}
private static string? GetLibraryWithAppId(string libraryFoldersVdfPath, string appId)
{

4
Dotnet/AppApi/Electron/RegistryPlayerPrefs.cs
View File

@@ -611,10 +611,10 @@ namespace VRCX
public string GetVRChatRegistryJson()
{
var registry = new Dictionary<string, Dictionary<string, object>>();
string regCommand = "query \"HKEY_CURRENT_USER\\SOFTWARE\\VRChat\\VRChat\"";
const string regCommand = "query \"HKEY_CURRENT_USER\\SOFTWARE\\VRChat\\VRChat\"";
var queryResult = GetWineRegCommand(regCommand);
if (queryResult == null)
return null;
throw new Exception("Failed to get VRC registry data");
var lines = queryResult.Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
.Where(line =>