From 0a7da79356f057b97da805442ffecc63cd540976 Mon Sep 17 00:00:00 2001 From: Neil Dorin Date: Thu, 26 Sep 2024 15:03:31 -0600 Subject: [PATCH] fix: Allows both BytesReceived and TextReceived to both fire on the ComPortController --- .../Comm and IR/ComPortController.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs b/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs index 59e8c768..41420b7c 100644 --- a/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs +++ b/src/PepperDash.Essentials.Core/Comm and IR/ComPortController.cs @@ -93,6 +93,7 @@ namespace PepperDash.Essentials.Core void OnDataReceived(string s) { + var eventSubscribed = false; var bytesHandler = BytesReceived; if (bytesHandler != null) @@ -101,7 +102,7 @@ namespace PepperDash.Essentials.Core if (StreamDebugging.RxStreamDebuggingIsEnabled) Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", ComTextHelper.GetEscapedText(bytes)); bytesHandler(this, new GenericCommMethodReceiveBytesArgs(bytes)); - return; + eventSubscribed = true; } var textHandler = TextReceived; if (textHandler != null) @@ -109,10 +110,10 @@ namespace PepperDash.Essentials.Core if (StreamDebugging.RxStreamDebuggingIsEnabled) Debug.LogMessage(LogEventLevel.Information, this, "Received: '{0}'", s); textHandler(this, new GenericCommMethodReceiveTextArgs(s)); - return; + eventSubscribed = true; } - Debug.LogMessage(LogEventLevel.Warning, this, "Received data but no handler is registered"); + if(!eventSubscribed) Debug.LogMessage(LogEventLevel.Warning, this, "Received data but no handler is registered"); } public override bool Deactivate()