diff --git a/src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionController.cs b/src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionController.cs index c1a16089..79bb7d01 100644 --- a/src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionController.cs +++ b/src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionController.cs @@ -1846,6 +1846,7 @@ namespace PepperDash.Essentials.Core.Fusion if (_helpRequestTimeoutTimer != null) { _helpRequestTimeoutTimer.Stop(); + _helpRequestTimeoutTimer.Elapsed -= OnTimedEvent; _helpRequestTimeoutTimer.Dispose(); _helpRequestTimeoutTimer = null; } @@ -1943,13 +1944,7 @@ namespace PepperDash.Essentials.Core.Fusion private void OnTimedEvent(object source, ElapsedEventArgs e) { - this.LogInformation("Help request timeout reached for room '{0}'. Cancelling help request.", - Room.Name); - CancelHelpRequest(); - _helpRequestTimeoutTimer.Stop(); - _helpRequestTimeoutTimer.Dispose(); - _helpRequestTimeoutTimer = null; } /// @@ -1964,6 +1959,17 @@ namespace PepperDash.Essentials.Core.Fusion HelpRequestStatusFeedback.FireUpdate(); Debug.LogMessage(LogEventLevel.Information, this, "Help request cancelled for room '{0}'", Room.Name); } + + if(_helpRequestTimeoutTimer != null) + { + _helpRequestTimeoutTimer.Stop(); + _helpRequestTimeoutTimer.Elapsed -= OnTimedEvent; + _helpRequestTimeoutTimer.Dispose(); + _helpRequestTimeoutTimer = null; + + this.LogDebug("Help request timeout timer stopped for room '{0}'.", + Room.Name); + } } /// diff --git a/src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionControllerPropertiesConfig.cs b/src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionControllerPropertiesConfig.cs index 639963f8..c9dea4c3 100644 --- a/src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionControllerPropertiesConfig.cs +++ b/src/PepperDash.Essentials.Core/Fusion/IEssentialsRoomFusionControllerPropertiesConfig.cs @@ -67,5 +67,5 @@ public class IEssentialsRoomFusionControllerPropertiesConfig /// Gets or sets the timeout duration for help requests in milliseconds /// [JsonProperty("helpRequestTimeoutMs")] - public int HelpRequestTimeoutMs{ get; set; } = 30000; + public int HelpRequestTimeoutMs { get; set; } = 30000; } \ No newline at end of file