From 3a3cb0c30b0577b495166f90f6679c18d268fa16 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Fri, 12 Feb 2021 16:14:08 +1000 Subject: [PATCH] Convert FirmwareEventArgs to a readonly struct --- .../fwmanager/FirmwareEventArgs.cs | 17 +++++++++++++---- .../fwmanager/FirmwareManager.cs | 9 +-------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/BizHawk.Client.Common/fwmanager/FirmwareEventArgs.cs b/src/BizHawk.Client.Common/fwmanager/FirmwareEventArgs.cs index f88549acee..513f847365 100644 --- a/src/BizHawk.Client.Common/fwmanager/FirmwareEventArgs.cs +++ b/src/BizHawk.Client.Common/fwmanager/FirmwareEventArgs.cs @@ -1,13 +1,22 @@ +#nullable enable + using BizHawk.Emulation.Common; namespace BizHawk.Client.Common { - public sealed class FirmwareEventArgs + public readonly struct FirmwareEventArgs { - public string Hash { get; set; } + public readonly string? Hash; - public FirmwareID ID { get; set; } + public readonly FirmwareID ID; - public long Size { get; set; } + public readonly long Size; + + public FirmwareEventArgs(FirmwareID id, string? hash, long size) + { + Hash = hash; + ID = id; + Size = size; + } } } diff --git a/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs b/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs index c3e9c0be8f..5b5efc5cb6 100644 --- a/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs +++ b/src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs @@ -42,14 +42,7 @@ namespace BizHawk.Client.Common { return null; } - - RecentlyServed.Add(new FirmwareEventArgs - { - ID = id, - Hash = resolved.Hash, - Size = resolved.Size - }); - + RecentlyServed.Add(new(id, resolved.Hash, resolved.Size)); return resolved.FilePath; }