Merge pull request #6090 from JosJuice/wrong-thread-event-name

Show event name when scheduling from wrong thread
dolphin-emu · Sep 30, 2017 · 5a609d2 · 5a609d2
2 parents 187d443 + db77549
commit 5a609d2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Source/Core/Core/CoreTiming.cpp b/Source/Core/Core/CoreTiming.cpp
@@ -241,7 +241,8 @@ void ScheduleEvent(s64 cycles_into_future, EventType* event_type, u64 userdata,
   {
     from_cpu_thread = from == FromThread::CPU;
     _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)