diff options
| author | Glenn Rice <glennricster@gmail.com> | 2011-03-31 20:33:11 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2011-03-31 20:33:11 +0000 |
| commit | b75d5d1676f0534c9665ffa5500a8ed94df4894d (patch) | |
| tree | 2a209d89d0532e0d2a0de1d5c8aec9c727cc84c0 /Source | |
| parent | d141dd6509f52275325c8402b918072e35a65fe1 (diff) | |
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
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/Core/Src/Core.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index 8406bc9469..a6d668f791 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -341,6 +341,8 @@ void EmuThread() DisplayMessage(cpu_info.Summarize(), 8000); DisplayMessage(_CoreParameter.m_strFilename, 3000); + HW::Init(); + if (!g_video_backend->Initialize(g_pWindowHandle)) { PanicAlert("Failed to initialize video backend!"); @@ -349,7 +351,6 @@ void EmuThread() OSD::AddMessage(("Dolphin " + g_video_backend->GetName() + " Video Backend.").c_str(), 5000); - HW::Init(); if (!DSP::GetDSPEmulator()->Initialize(g_pWindowHandle, _CoreParameter.bWii, _CoreParameter.bDSPThread)) { |