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 #6090 from JosJuice/wrong-thread-event-name 

Show event name when scheduling from wrong thread
This commit is contained in:
JosJuice 2017-09-30 16:20:27 +02:00 committed by GitHub
parent 187d443a36 db77549502
commit 5a609d22f6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/CoreTiming.cpp
View File

@ -241,7 +241,8 @@ void ScheduleEvent(s64 cycles_into_future, EventType* event_type, u64 userdata,
{ {
from_cpu_thread = from == FromThread::CPU; from_cpu_thread = from == FromThread::CPU;
_assert_msg_(POWERPC, from_cpu_thread == Core::IsCPUThread(), _assert_msg_(POWERPC, from_cpu_thread == Core::IsCPUThread(),
"ScheduleEvent from wrong thread (%s)", from_cpu_thread ? "CPU" : "non-CPU"); "A \"%s\" event was scheduled from the wrong thread (%s)",
event_type->name->c_str(), from_cpu_thread ? "CPU" : "non-CPU");
} }
if (from_cpu_thread) if (from_cpu_thread)