From 87d4b14ca960a23464db55fc5f2ab1fb703b42ff Mon Sep 17 00:00:00 2001 From: Nekotekina Date: Tue, 10 Mar 2020 11:24:32 +0300 Subject: [PATCH] Pause only on fatal messages Also make some access violation an error since we don't pause on it. --- Utilities/Thread.cpp | 2 +- rpcs3/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp index 70c243fafc..ad480f9c03 100644 --- a/Utilities/Thread.cpp +++ b/Utilities/Thread.cpp @@ -1449,7 +1449,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context) no if (!access_violation_recovered) { vm_log.notice("\n%s", cpu->dump()); - vm_log.fatal("Access violation %s location 0x%x (%s)", is_writing ? "writing" : "reading", addr, (is_writing && vm::check_addr(addr)) ? "read-only memory" : "unmapped memory"); + vm_log.error("Access violation %s location 0x%x (%s)", is_writing ? "writing" : "reading", addr, (is_writing && vm::check_addr(addr)) ? "read-only memory" : "unmapped memory"); } // TODO: diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp index fd57c2450c..1adb381725 100644 --- a/rpcs3/main.cpp +++ b/rpcs3/main.cpp @@ -152,7 +152,7 @@ struct pause_on_fatal final : logs::listener void log(u64 /*stamp*/, const logs::message& msg, const std::string& /*prefix*/, const std::string& /*text*/) override { - if (msg.sev <= logs::level::fatal) + if (msg.sev == logs::level::fatal) { // Pause emulation if fatal error encountered Emu.Pause();