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
This commit is contained in:
parent
4de10e2d94
commit
233c28ee22
|
@ -341,7 +341,7 @@ THREAD_RETURN EmuThread(void *pArg)
|
||||||
//CPU thread should in this case also create the emuwindow...
|
//CPU thread should in this case also create the emuwindow...
|
||||||
|
|
||||||
//Spawn the CPU thread
|
//Spawn the CPU thread
|
||||||
Common::Thread *cpuThread = NULL;
|
Common::Thread *cpuThread = new Common::Thread(CpuThread, pArg);
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////
|
||||||
// ENTER THE VIDEO THREAD LOOP
|
// ENTER THE VIDEO THREAD LOOP
|
||||||
|
@ -349,7 +349,7 @@ THREAD_RETURN EmuThread(void *pArg)
|
||||||
|
|
||||||
if (!Core::GetStartupParameter().bUseDualCore)
|
if (!Core::GetStartupParameter().bUseDualCore)
|
||||||
{
|
{
|
||||||
/*Common::SetCurrentThreadName("Idle thread");
|
Common::SetCurrentThreadName("Idle thread");
|
||||||
//TODO(ector) : investigate using GetMessage instead .. although
|
//TODO(ector) : investigate using GetMessage instead .. although
|
||||||
//then we lose the powerdown check. ... unless powerdown sends a message :P
|
//then we lose the powerdown check. ... unless powerdown sends a message :P
|
||||||
while (PowerPC::state != PowerPC::CPU_POWERDOWN)
|
while (PowerPC::state != PowerPC::CPU_POWERDOWN)
|
||||||
|
@ -362,14 +362,13 @@ THREAD_RETURN EmuThread(void *pArg)
|
||||||
#else
|
#else
|
||||||
Common::SleepCurrentThread(200);
|
Common::SleepCurrentThread(200);
|
||||||
#endif
|
#endif
|
||||||
}*/
|
}
|
||||||
|
|
||||||
// In single-core mode, the Emulation main thread is also the CPU thread
|
// In single-core mode, the Emulation main thread is also the CPU thread
|
||||||
CpuThread(pArg);
|
CpuThread(pArg);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cpuThread = new Common::Thread(CpuThread, pArg);
|
|
||||||
PluginVideo::Video_Prepare(); //wglMakeCurrent
|
PluginVideo::Video_Prepare(); //wglMakeCurrent
|
||||||
Common::SetCurrentThreadName("Video thread");
|
Common::SetCurrentThreadName("Video thread");
|
||||||
PluginVideo::Video_EnterLoop();
|
PluginVideo::Video_EnterLoop();
|
||||||
|
|
Loading…
Reference in New Issue