From 410be95ab68ff1246eb24d6157c18d4c8c2dcf5a Mon Sep 17 00:00:00 2001 From: TSRBerry <20988865+TSRBerry@users.noreply.github.com> Date: Tue, 17 Jan 2023 15:50:39 +0100 Subject: [PATCH] Fix NRE when disposing AddressSpace with 4KB pages support (#4307) --- Ryujinx.Cpu/AddressSpace.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ryujinx.Cpu/AddressSpace.cs b/Ryujinx.Cpu/AddressSpace.cs index cea3b56d29..9dc32426cd 100644 --- a/Ryujinx.Cpu/AddressSpace.cs +++ b/Ryujinx.Cpu/AddressSpace.cs @@ -462,7 +462,7 @@ namespace Ryujinx.Cpu public void Dispose() { - _privateMemoryAllocator.Dispose(); + _privateMemoryAllocator?.Dispose(); Base.Dispose(); Mirror.Dispose(); }