[Project64] Initialize base system first
This commit is contained in:
parent
02e2168740
commit
2ea9fd21e5
|
@ -507,16 +507,15 @@ void CN64System::StartEmulation2(bool NewThread)
|
|||
g_Settings->SaveDword(Game_CurrentSaveState, g_Settings->LoadDefaultDword(Game_CurrentSaveState));
|
||||
|
||||
WriteTrace(TraceN64System, TraceDebug, "Setting system as active");
|
||||
bool bSetActive = true;
|
||||
if (m_SyncCPU)
|
||||
bool bSetActive = SetActiveSystem();
|
||||
if (bSetActive && m_SyncCPU)
|
||||
{
|
||||
bSetActive = m_SyncCPU->SetActiveSystem();
|
||||
}
|
||||
|
||||
if (bSetActive)
|
||||
{
|
||||
bSetActive = SetActiveSystem();
|
||||
}
|
||||
}
|
||||
|
||||
WriteTrace(TraceN64System, TraceDebug, "Setting system as active");
|
||||
if (!m_Plugins->Reset(this) || !m_Plugins->initilized())
|
||||
|
@ -688,7 +687,7 @@ void CN64System::Reset(bool bInitReg, bool ClearMenory)
|
|||
m_Plugins->RomClosed();
|
||||
m_Plugins->RomOpened();
|
||||
}
|
||||
if (m_SyncCPU)
|
||||
if (m_SyncCPU && m_SyncCPU->m_MMU_VM.Rdram() != NULL)
|
||||
{
|
||||
m_SyncCPU->Reset(bInitReg, ClearMenory);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue