Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only silence logging during gameplay #14143

Merged
merged 2 commits into from Jul 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions rpcs3/Emu/System.cpp
Expand Up @@ -791,6 +791,9 @@ game_boot_result Emulator::Load(const std::string& title_id, bool is_disc_patch,
return game_boot_result::still_running;
}

// Enable logging
rpcs3::utils::configure_logs(true);

m_ar.reset();

{
Expand Down Expand Up @@ -2502,6 +2505,9 @@ extern bool try_lock_spu_threads_in_a_state_compatible_with_savestates(bool reve

void Emulator::Kill(bool allow_autoexit, bool savestate)
{
// Enable logging
rpcs3::utils::configure_logs(true);

if (!IsStopped() && savestate && !try_lock_spu_threads_in_a_state_compatible_with_savestates())
{
sys_log.error("Failed to savestate: failed to lock SPU threads execution.");
Expand Down
6 changes: 3 additions & 3 deletions rpcs3/Emu/system_utils.cpp
Expand Up @@ -38,17 +38,17 @@ namespace rpcs3::utils
return thread_count;
}

void configure_logs()
void configure_logs(bool force_enable)
{
static bool was_silenced = false;

const bool silenced = g_cfg.misc.silence_all_logs.get();
const bool silenced = g_cfg.misc.silence_all_logs.get() && !force_enable;

if (silenced)
{
if (!was_silenced)
{
sys_log.success("Disabling logging! Do not create issues on GitHub or on the forums while logging is disabled.");
sys_log.always()("Disabling logging! Do not create issues on GitHub or on the forums while logging is disabled.");
}

logs::silence();
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/system_utils.hpp
Expand Up @@ -7,7 +7,7 @@ namespace rpcs3::utils
{
u32 get_max_threads();

void configure_logs();
void configure_logs(bool force_enable = false);

u32 check_user(const std::string& user);

Expand Down
5 changes: 3 additions & 2 deletions rpcs3/main_application.cpp
Expand Up @@ -79,10 +79,11 @@ void main_application::OnEmuSettingsChange()
}
}

rpcs3::utils::configure_logs();

if (!Emu.IsStopped())
{
// Change logging (only allowed during gameplay)
rpcs3::utils::configure_logs();

// Force audio provider
g_cfg.audio.provider.set(Emu.IsVsh() ? audio_provider::rsxaudio : audio_provider::cell_audio);
}
Expand Down