summaryrefslogtreecommitdiff
path: root/src/core/core_timing.cpp
diff options
context:
space:
mode:
authorGravatar archshift2015-02-18 22:18:47 -0800
committerGravatar archshift2015-02-18 22:26:22 -0800
commit5efd149ad56efb2a00332af5a791b403e7f70273 (patch)
tree90492d27a1c67a480f8675c269a63932cee28432 /src/core/core_timing.cpp
parentMerge pull request #580 from lioncash/emplace (diff)
downloadyuzu-5efd149ad56efb2a00332af5a791b403e7f70273.tar.gz
yuzu-5efd149ad56efb2a00332af5a791b403e7f70273.tar.xz
yuzu-5efd149ad56efb2a00332af5a791b403e7f70273.zip
Remove the useless msg_handler compilation unit that was left over from Dolphin
Diffstat (limited to 'src/core/core_timing.cpp')
-rw-r--r--src/core/core_timing.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp
index cabe2a074..6f716b1ca 100644
--- a/src/core/core_timing.cpp
+++ b/src/core/core_timing.cpp
@@ -147,7 +147,7 @@ void RestoreRegisterEvent(int event_type, const char* name, TimedCallback callba
147 147
148void UnregisterAllEvents() { 148void UnregisterAllEvents() {
149 if (first) 149 if (first)
150 PanicAlert("Cannot unregister events with events pending"); 150 LOG_ERROR(Core_Timing, "Cannot unregister events with events pending");
151 event_types.clear(); 151 event_types.clear();
152} 152}
153 153
@@ -535,7 +535,7 @@ std::string GetScheduledEventsSummary() {
535 while (event) { 535 while (event) {
536 unsigned int t = event->type; 536 unsigned int t = event->type;
537 if (t >= event_types.size()) 537 if (t >= event_types.size())
538 PanicAlert("Invalid event type"); // %i", t); 538 LOG_ERROR(Core_Timing, "Invalid event type"); // %i", t);
539 const char* name = event_types[event->type].name; 539 const char* name = event_types[event->type].name;
540 if (!name) 540 if (!name)
541 name = "[unknown]"; 541 name = "[unknown]";