diff --git a/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs b/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs index 47d8a21392..0378357190 100644 --- a/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs +++ b/BizHawk.Client.Common/lua/EmuLuaLibrary.Memory.cs @@ -40,6 +40,11 @@ namespace BizHawk.Client.Common { if (MemoryDomainCore != null) { + if (_currentMemoryDomain == null) + { + _currentMemoryDomain = MemoryDomainCore.MainMemory; + } + return _currentMemoryDomain; } else