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

little fix for r6513 thank to metatheos for finding the error 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6518 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Rodolfo Osvaldo Bogado 2010-12-04 22:04:46 +00:00
parent c8305a7b7d
commit 379fa47b6a
1 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
Source/Core/Core/Src/CoreTiming.cpp
View File

@ -306,14 +306,20 @@ bool IsScheduled(int event_type)
void RemoveEvent(int event_type)
{
if (!first)
return;
if (first->type == event_type)
while(first)
{
Event *next = first->next;
FreeEvent(first);
first = next;
if (first->type == event_type)
{
Event *next = first->next;
FreeEvent(first);
first = next;
}
else
{
break;
}
}
if (!first)
return;
@ -343,11 +349,18 @@ void RemoveThreadsafeEvent(int event_type)
externalEventSection.Leave();
return;
}
if (tsFirst->type == event_type)
while(tsFirst)
{
Event *next = tsFirst->next;
FreeTsEvent(tsFirst);
tsFirst = next;
if (tsFirst->type == event_type)
{
Event *next = tsFirst->next;
FreeTsEvent(tsFirst);
tsFirst = next;
}
else
{
break;
}
}
if (!tsFirst)
{
@ -398,34 +411,20 @@ void ProcessFifoWaitEvents()
if (!first)
return;
if (first->time <= globalTimer)
while (first)
{
Event *next = first->next;
event_types[first->type].callback(first->userdata, (int)(globalTimer - first->time));
FreeEvent(first);
first = next;
}
if (!first)
return;
Event *prev = first;
Event *ptr = prev->next;
while (ptr)
{
if (ptr->time <= globalTimer)
{
prev->next = ptr->next;
event_types[ptr->type].callback(ptr->userdata, (int)(globalTimer - ptr->time));
FreeEvent(ptr);
ptr = prev->next;
if (first->time <= globalTimer)
{
Event* evt = first;
first = first->next;
event_types[evt->type].callback(evt->userdata, (int)(globalTimer - evt->time));
FreeEvent(evt);
}
else
{
prev = ptr;
ptr = ptr->next;
break;
}
}
}
}
void MoveEvents()