ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2332 from comex/fix-alerts-maybe 

Fix some false positive ScheduleEvent alerts
This commit is contained in:
skidau 2015-04-30 14:03:00 +10:00
parent e710812d88 a9fe0ec0ab
commit 052162e6b9
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/Core.cpp
View File

@ -362,6 +362,7 @@ static void FifoPlayerThread()
} }
s_is_started = true; s_is_started = true;
DeclareAsCPUThread();
// Enter CPU run loop. When we leave it - we are done. // Enter CPU run loop. When we leave it - we are done.
if (FifoPlayer::GetInstance().Open(_CoreParameter.m_strFilename)) if (FifoPlayer::GetInstance().Open(_CoreParameter.m_strFilename))
@ -370,6 +371,7 @@ static void FifoPlayerThread()
FifoPlayer::GetInstance().Close(); FifoPlayer::GetInstance().Close();
} }
UndeclareAsCPUThread();
s_is_started = false; s_is_started = false;
if (!_CoreParameter.bCPUThread) if (!_CoreParameter.bCPUThread)

2
Source/Core/Core/HW/EXI_DeviceEthernet.cpp
View File

@ -403,7 +403,7 @@ void CEXIETHERNET::SendComplete()
mBbaMem[BBA_IR] |= INT_T; mBbaMem[BBA_IR] |= INT_T;
exi_status.interrupt |= exi_status.TRANSFER; exi_status.interrupt |= exi_status.TRANSFER;
ExpansionInterface::ScheduleUpdateInterrupts_Threadsafe(0); ExpansionInterface::ScheduleUpdateInterrupts(0);
} }
mBbaMem[BBA_LTPS] = 0; mBbaMem[BBA_LTPS] = 0;