Fix for: reading data too early, null reference

1-max-1 · Nov 24, 2024 · 8c85f3a · 8c85f3a
1 parent 43b4835
commit 8c85f3a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/WASMSerialTerminal/Index.razor b/WASMSerialTerminal/Index.razor
@@ -67,7 +67,6 @@
 	private const int MAX_BYTES = 150000;
 
 	protected override void OnInitialized() {
-		serialService.DataReceived += OnSerialDataReceived;
 		serialService.SerialError += OnSerialError;
 	}
 
@@ -91,6 +90,7 @@
 
 				serialDataStream = new();
 				dataStreamReader = new(serialDataStream, textEncoding, false, -1, true);
+				serialService.DataReceived += OnSerialDataReceived;
 			}
 		}
 		catch (SerialSecurityException) {
@@ -107,8 +107,9 @@
 		connectionStatusText = "(Disconnected)";
 		connectionStatusBoldText = "";
 
-		serialDataStream!.Close();
-		dataStreamReader!.Close();
+		serialService.DataReceived -= OnSerialDataReceived;
+		serialDataStream?.Close();
+		dataStreamReader?.Close();
 	}
 
 	private async Task OnDisconnectButtonClick() {