Fix for a single core mode stop-hang. Fix a build error in IL mode.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2328 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
757d8728b7
commit
e6ca85c059
|
@ -475,11 +475,10 @@ THREAD_RETURN EmuThread(void *pArg)
|
|||
// The hardware is uninitialized
|
||||
g_bHwInit = false;
|
||||
|
||||
Plugins.ShutdownPlugins();
|
||||
|
||||
HW::Shutdown();
|
||||
|
||||
LOG(MASTER_LOG, "EmuThread exited");
|
||||
Plugins.ShutdownPlugins();
|
||||
|
||||
LOG(MASTER_LOG, "EmuThread exited");
|
||||
// The CPU should return when a game is stopped and cleanup should be done here,
|
||||
// so we can restart the plugins (or load new ones) for the next game.
|
||||
if (_CoreParameter.hMainWindow == g_pWindowHandle)
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
#include "JitCache.h"
|
||||
#include "Thunk.h"
|
||||
|
||||
#include "../../HW/CPUCompare.h"
|
||||
#include "../../HW/GPFifo.h"
|
||||
#include "../../Core.h"
|
||||
#include "JitAsm.h"
|
||||
|
|
|
@ -51,7 +51,7 @@ void Fifo_Init()
|
|||
{
|
||||
videoBuffer = (u8*)AllocateMemoryPages(FIFO_SIZE);
|
||||
fifo_exit_event.Init();
|
||||
fifoStateRun = true;
|
||||
fifoStateRun = false;
|
||||
g_XFBUpdateRequested = FALSE;
|
||||
}
|
||||
|
||||
|
@ -101,6 +101,7 @@ void Fifo_ExitLoop()
|
|||
|
||||
void Fifo_EnterLoop(const SVideoInitialize &video_initialize)
|
||||
{
|
||||
fifoStateRun = true;
|
||||
SCPFifoStruct &_fifo = *video_initialize.pCPFifo;
|
||||
s32 distToSend;
|
||||
|
||||
|
|
Loading…
Reference in New Issue