Skip to content
This repository was archived by the owner on Jan 31, 2026. It is now read-only.

Fix race condition in BHapticsConnection.Initialize() #18

Closed
Copilot wants to merge 2 commits into from
Closed

Fix race condition in BHapticsConnection.Initialize() #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fede21
Initial plan
Copilot Nov 23, 2025
b5dab95
Fix race condition in Initialize method with thread-safe locking
Copilot Nov 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 33 additions & 28 deletions bHapticsManager/BHapticsConnection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class BHapticsConnection {

private static ModernBHapticsWorkerThread _workerThread = null!;
private static bool _isInitialized = false;
private static readonly object _initializeLock = new();
private static readonly object _shutdownLock = new();
private static bool _isShuttingDown = false;

Expand All @@ -37,36 +38,38 @@ internal void RaiseDeviceDisconnected(LegacyBHaptics.PositionType position) {
/// Called once during mod initialization.

public static bool Initialize() {
if (_isInitialized) {
ResoniteMod.Warn("Already initialized - skipping duplicate connection");
return true;
}

// Connect to bHaptics Player
bool connected = ModernBHaptics.bHapticsManager.Connect("Resonite", "Resonite", true, 10);

if (!connected) {
ResoniteMod.Error("Failed to connect to bHaptics Player!");
ResoniteMod.Error("Make sure bHaptics Player is running and try restarting Resonite.");
return false;
}
lock (_initializeLock) {
if (_isInitialized) {
ResoniteMod.Warn("Already initialized - skipping duplicate connection");
return true;
}

// Connect to bHaptics Player
bool connected = ModernBHaptics.bHapticsManager.Connect("Resonite", "Resonite", true, 10);

if (!connected) {
ResoniteMod.Error("Failed to connect to bHaptics Player!");
ResoniteMod.Error("Make sure bHaptics Player is running and try restarting Resonite.");
return false;
}

_isInitialized = true;
ResoniteMod.Msg("bHapticsManager connected successfully!");

// Log connected devices
int deviceCount = ModernBHaptics.bHapticsManager.GetConnectedDeviceCount();
ResoniteMod.Msg($"Connected devices: {deviceCount}");

foreach (ModernBHaptics.PositionID pos in Enum.GetValues(typeof(ModernBHaptics.PositionID))) {
if (ModernBHaptics.bHapticsManager.IsDeviceConnected(pos)) {
ResoniteMod.Debug($"Device {pos} ready");
// Add to cache
DeviceCache[pos] = (true, DateTime.Now);
_isInitialized = true;
ResoniteMod.Msg("bHapticsManager connected successfully!");

// Log connected devices
int deviceCount = ModernBHaptics.bHapticsManager.GetConnectedDeviceCount();
ResoniteMod.Msg($"Connected devices: {deviceCount}");

foreach (ModernBHaptics.PositionID pos in Enum.GetValues(typeof(ModernBHaptics.PositionID))) {
if (ModernBHaptics.bHapticsManager.IsDeviceConnected(pos)) {
ResoniteMod.Debug($"Device {pos} ready");
// Add to cache
DeviceCache[pos] = (true, DateTime.Now);
}
}
}

return true;
return true;
}
}

public List<LegacyBHaptics.PositionType> GetConnectedDevices() {
Expand Down Expand Up @@ -185,7 +188,9 @@ public static void Shutdown() {
ResoniteMod.Error($"Error clearing device cache: {ex}");
}

_isInitialized = false;
lock (_initializeLock) {
_isInitialized = false;
}
ResoniteMod.Msg("bHaptics connection shutdown complete");
}
catch (Exception ex) {
Expand Down