IOS: Fix AddCoreDevices being called twice
Also make sure m_title_id is set as soon as possible.
This commit is contained in:
parent
327180daa7
commit
adf9218e74
|
@ -200,9 +200,12 @@ Kernel::~Kernel()
|
|||
Core::ShutdownWiiRoot();
|
||||
}
|
||||
|
||||
EmulationKernel::EmulationKernel(u64 title_id)
|
||||
Kernel::Kernel(u64 title_id) : m_title_id(title_id)
|
||||
{
|
||||
}
|
||||
|
||||
EmulationKernel::EmulationKernel(u64 title_id) : Kernel(title_id)
|
||||
{
|
||||
m_title_id = title_id;
|
||||
INFO_LOG(IOS, "Starting IOS %016" PRIx64, title_id);
|
||||
|
||||
if (!SetupMemory(title_id, MemorySetupType::IOSReload))
|
||||
|
|
|
@ -118,6 +118,8 @@ public:
|
|||
IOSC& GetIOSC();
|
||||
|
||||
protected:
|
||||
explicit Kernel(u64 title_id);
|
||||
|
||||
void ExecuteIPCCommand(u32 address);
|
||||
IPCCommandResult HandleIPCCommand(const Request& request);
|
||||
void EnqueueIPCAcknowledgement(u32 address, int cycles_in_future = 0);
|
||||
|
|
Loading…
Reference in New Issue