github/VRCX
1
1
Fork 0
mirror of https://github.com/vrcx-team/VRCX.git synced 2026-04-06 00:32:02 +02:00
Code Issues 51 Packages Projects Releases Wiki Activity

Close -> Dispose

Browse Source
This commit is contained in:
Natsumi
2025-10-22 12:58:38 +11:00
parent 482d8abd6d
commit 9547297a09
2 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Dotnet/AppApi/Cef/GameHandler.cs
View File

@@ -78,8 +78,7 @@ namespace VRCX
FileName = $"{path}\\steam.exe",
UseShellExecute = false,
Arguments = $"-applaunch 438100 {arguments}"
})
?.Close();
})?.Dispose();
return true;
}
}
@@ -122,7 +121,7 @@ namespace VRCX
FileName = path,
UseShellExecute = false,
Arguments = arguments
})?.Close();
})?.Dispose();
return true;
}
}

38
Dotnet/AppApi/Electron/GameHandler.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
namespace VRCX
{
@@ -16,58 +17,40 @@ namespace VRCX
/// </summary>
public override void CheckGameRunning()
{
var isGameRunning = false;
var isSteamVRRunning = false;
if (ProcessMonitor.Instance.IsProcessRunning("VRChat"))
{
isGameRunning = true;
}
if (ProcessMonitor.Instance.IsProcessRunning("vrserver"))
{
isSteamVRRunning = true;
}
ProcessMonitor.Instance.IsProcessRunning("VRChat");
ProcessMonitor.Instance.IsProcessRunning("vrserver");
}
public override bool IsGameRunning()
{
var processes = Process.GetProcessesByName("VRChat");
var isGameRunning = processes.Length > 0;
foreach (var process in processes)
process.Dispose();
return isGameRunning;
}
public override bool IsSteamVRRunning()
{
// Check exact matches (fast - no full process scan needed)
var processNames = new[] { "vrmonitor", "monado-service" };
foreach (var name in processNames)
{
var processes = Process.GetProcessesByName(name);
var isSteamVRRunning = processes.Length > 0;
foreach (var process in processes)
process.Dispose();
if (isSteamVRRunning)
return true;
}
// Check for wivrn-server (requires full scan)
var allProcesses = Process.GetProcesses();
var isRunning = false;
foreach (var process in allProcesses)
{
if (process.ProcessName.EndsWith("wivrn-server"))
{
isRunning = true;
break;
}
}
var isRunning = allProcesses.Any(process => process.ProcessName.EndsWith("wivrn-server"));
foreach (var process in allProcesses)
process.Dispose();
return isRunning;
}
@@ -76,9 +59,9 @@ namespace VRCX
var processes = Process.GetProcessesByName("vrchat");
if (processes.Length == 1)
processes[0].Kill();
foreach (var process in processes)
process.Dispose();
return processes.Length;
}
@@ -86,13 +69,12 @@ namespace VRCX
{
try
{
var process = Process.Start(new ProcessStartInfo
Process.Start(new ProcessStartInfo
{
FileName = "steam",
Arguments = $"-applaunch 438100 {arguments}",
UseShellExecute = false,
});
process?.Dispose();
})?.Dispose();
return true; // Steam accepted launch command (no exception thrown)
}
catch (Exception e)