From b75d5d1676f0534c9665ffa5500a8ed94df4894d Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Thu, 31 Mar 2011 20:33:11 +0000 Subject: [PATCH] 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 --- Source/Core/Core/Src/Core.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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)) {