summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authordaco65 <daco65@gmail.com>2008-09-16 16:28:36 +0000
committerdaco65 <daco65@gmail.com>2008-09-16 16:28:36 +0000
commit233c28ee226dccb272f8048ee683aceafc8392be (patch)
treeb2814bc0586cfaff7228b9dc26d3f782172a3a30 /Source
parent4de10e2d94a8e91e1ccf65cabc6dfb2f9c127fb6 (diff)
reverted some code from rev 532. dolphin had focus trouble
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@540 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/Src/Core.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index 106df54927..d165b0967b 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -341,7 +341,7 @@ THREAD_RETURN EmuThread(void *pArg)
//CPU thread should in this case also create the emuwindow...
//Spawn the CPU thread
- Common::Thread *cpuThread = NULL;
+ Common::Thread *cpuThread = new Common::Thread(CpuThread, pArg);
//////////////////////////////////////////////////////////////////////////
// ENTER THE VIDEO THREAD LOOP
@@ -349,7 +349,7 @@ THREAD_RETURN EmuThread(void *pArg)
if (!Core::GetStartupParameter().bUseDualCore)
{
- /*Common::SetCurrentThreadName("Idle thread");
+ Common::SetCurrentThreadName("Idle thread");
//TODO(ector) : investigate using GetMessage instead .. although
//then we lose the powerdown check. ... unless powerdown sends a message :P
while (PowerPC::state != PowerPC::CPU_POWERDOWN)
@@ -362,14 +362,13 @@ THREAD_RETURN EmuThread(void *pArg)
#else
Common::SleepCurrentThread(200);
#endif
- }*/
+ }
// In single-core mode, the Emulation main thread is also the CPU thread
CpuThread(pArg);
}
else
{
- cpuThread = new Common::Thread(CpuThread, pArg);
PluginVideo::Video_Prepare(); //wglMakeCurrent
Common::SetCurrentThreadName("Video thread");
PluginVideo::Video_EnterLoop();