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: overlay function queue keep growing cause memory leak in electron (#1659)

Browse Source
This commit is contained in:
Misaka_L
2026-02-28 14:17:18 +08:00
committed by GitHub
parent 6babfb31fe
commit 033b53535e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dotnet/Overlay/Electron/VRCXVRElectron.cs
+9 -3
View File
@@ -25,6 +25,7 @@ namespace VRCX
private readonly List<string[]> _deviceList; private readonly List<string[]> _deviceList;
private readonly ReaderWriterLockSlim _deviceListLock; private readonly ReaderWriterLockSlim _deviceListLock;
private bool _active; private bool _active;
private bool _isOverlayStarted;
private bool _menuButton; private bool _menuButton;
private int _overlayHand; private int _overlayHand;
private GLTextureWriter _overlayTextureWriter; private GLTextureWriter _overlayTextureWriter;
@@ -213,6 +214,7 @@ namespace VRCX
active = true; active = true;
SetupTextures(); SetupTextures();
_isOverlayStarted = true;
} }
while (system.PollNextEvent(ref e, (uint)Marshal.SizeOf(e))) while (system.PollNextEvent(ref e, (uint)Marshal.SizeOf(e)))
@@ -220,6 +222,7 @@ namespace VRCX
var type = (EVREventType)e.eventType; var type = (EVREventType)e.eventType;
if (type == EVREventType.VREvent_Quit) if (type == EVREventType.VREvent_Quit)
{ {
_isOverlayStarted = false;
active = false; active = false;
IsHmdAfk = false; IsHmdAfk = false;
OpenVR.Shutdown(); OpenVR.Shutdown();
@@ -290,6 +293,7 @@ namespace VRCX
else if (active) else if (active)
{ {
active = false; active = false;
_isOverlayStarted = false;
IsHmdAfk = false; IsHmdAfk = false;
OpenVR.Shutdown(); OpenVR.Shutdown();
_deviceListLock.EnterWriteLock(); _deviceListLock.EnterWriteLock();
@@ -848,9 +852,11 @@ namespace VRCX
public override void ExecuteVrOverlayFunction(string function, string json) public override void ExecuteVrOverlayFunction(string function, string json)
{ {
//if (_hmdOverlaySocket == null || !_hmdOverlaySocket.Connected) return; if (!_isOverlayStarted)
// if (_hmdOverlay.IsLoading) {
// Restart(); _overlayFunctionQueue.Clear();
return;
}
_overlayFunctionQueue.Enqueue(new KeyValuePair<string, string>(function, json)); _overlayFunctionQueue.Enqueue(new KeyValuePair<string, string>(function, json));
} }