From fe05442ab08f32d999c98673d29a36b7379d651b Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Tue, 3 Aug 2021 01:51:13 +1000 Subject: [PATCH] Clean up nullability in comm API --- src/BizHawk.Client.Common/Api/Classes/CommApi.cs | 6 +++--- src/BizHawk.Client.Common/Api/Interfaces/ICommApi.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BizHawk.Client.Common/Api/Classes/CommApi.cs b/src/BizHawk.Client.Common/Api/Classes/CommApi.cs index b231ad8c24..9888dffc18 100644 --- a/src/BizHawk.Client.Common/Api/Classes/CommApi.cs +++ b/src/BizHawk.Client.Common/Api/Classes/CommApi.cs @@ -6,15 +6,15 @@ namespace BizHawk.Client.Common { private static readonly WebSocketServer _wsServer = new WebSocketServer(); - private readonly (HttpCommunication HTTP, MemoryMappedFiles MMF, SocketServer Sockets) _networkingHelpers; + private readonly (HttpCommunication? HTTP, MemoryMappedFiles MMF, SocketServer? Sockets) _networkingHelpers; public HttpCommunication? HTTP => _networkingHelpers.HTTP; - public MemoryMappedFiles? MMF => _networkingHelpers.MMF; + public MemoryMappedFiles MMF => _networkingHelpers.MMF; public SocketServer? Sockets => _networkingHelpers.Sockets; - public WebSocketServer? WebSockets => _wsServer; + public WebSocketServer WebSockets => _wsServer; public CommApi(IMainFormForApi mainForm) => _networkingHelpers = mainForm.NetworkingHelpers; diff --git a/src/BizHawk.Client.Common/Api/Interfaces/ICommApi.cs b/src/BizHawk.Client.Common/Api/Interfaces/ICommApi.cs index 3f30af1f5b..3d40a598f7 100644 --- a/src/BizHawk.Client.Common/Api/Interfaces/ICommApi.cs +++ b/src/BizHawk.Client.Common/Api/Interfaces/ICommApi.cs @@ -6,12 +6,12 @@ namespace BizHawk.Client.Common { HttpCommunication? HTTP { get; } - MemoryMappedFiles? MMF { get; } + MemoryMappedFiles MMF { get; } SocketServer? Sockets { get; } #if ENABLE_WEBSOCKETS - WebSocketServer? WebSockets { get; } + WebSocketServer WebSockets { get; } #endif string? HttpTest();