ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the segmentation faults on emulation start on linux. The HW::Init() call needs to be before the video backend initialization. This is the way it was before soren's change in revision 7188. Now the emulator initialization sequence is pretty much back to the way it was before. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7429 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-03-31 20:33:11 +00:00
parent d141dd6509
commit b75d5d1676
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/Src/Core.cpp
View File

@ -341,6 +341,8 @@ void EmuThread()
DisplayMessage(cpu_info.Summarize(), 8000); DisplayMessage(cpu_info.Summarize(), 8000);
DisplayMessage(_CoreParameter.m_strFilename, 3000); DisplayMessage(_CoreParameter.m_strFilename, 3000);
HW::Init();
if (!g_video_backend->Initialize(g_pWindowHandle)) if (!g_video_backend->Initialize(g_pWindowHandle))
{ {
PanicAlert("Failed to initialize video backend!"); PanicAlert("Failed to initialize video backend!");
@ -349,7 +351,6 @@ void EmuThread()
OSD::AddMessage(("Dolphin " + g_video_backend->GetName() + " Video Backend.").c_str(), 5000); OSD::AddMessage(("Dolphin " + g_video_backend->GetName() + " Video Backend.").c_str(), 5000);
HW::Init();
if (!DSP::GetDSPEmulator()->Initialize(g_pWindowHandle, if (!DSP::GetDSPEmulator()->Initialize(g_pWindowHandle,
_CoreParameter.bWii, _CoreParameter.bDSPThread)) _CoreParameter.bWii, _CoreParameter.bDSPThread))
{ {