Skip to content

Commit

Permalink
overlays: only log actual input loop errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Megamouse committed Apr 20, 2022
1 parent 9f676d4 commit 11d2758
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 7 deletions.
5 changes: 4 additions & 1 deletion rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp
Expand Up @@ -218,7 +218,10 @@ namespace rsx

if (const auto error = run_input_loop())
{
rsx_log.error("Media dialog input loop exited with error code=%d", error);
if (error != selection_code::canceled)
{
rsx_log.error("Media list dialog input loop exited with error code=%d", error);
}
return error;
}

Expand Down
10 changes: 8 additions & 2 deletions rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
Expand Up @@ -259,7 +259,10 @@ namespace rsx
{
if (const auto error = run_input_loop())
{
rsx_log.error("Dialog input loop exited with error code=%d", error);
if (error != selection_code::canceled)
{
rsx_log.error("Message dialog input loop exited with error code=%d", error);
}
return error;
}
}
Expand Down Expand Up @@ -296,7 +299,10 @@ namespace rsx

if (const auto error = run_input_loop())
{
rsx_log.error("Dialog input loop exited with error code=%d", error);
if (error != selection_code::canceled)
{
rsx_log.error("Message dialog input loop exited with error code=%d", error);
}
}
}
else
Expand Down
5 changes: 4 additions & 1 deletion rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
Expand Up @@ -1191,7 +1191,10 @@ namespace rsx

if (const auto error = run_input_loop())
{
rsx_log.error("Osk input loop exited with error code=%d", error);
if (error != selection_code::canceled)
{
rsx_log.error("Osk input loop exited with error code=%d", error);
}
}

thread_bits &= ~tbit;
Expand Down
10 changes: 8 additions & 2 deletions rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
Expand Up @@ -307,8 +307,14 @@ namespace rsx

visible = true;

if (const auto err = run_input_loop())
return err;
if (const auto error = run_input_loop())
{
if (error != selection_code::canceled)
{
rsx_log.error("Save dialog input loop exited with error code=%d", error);
}
return error;
}

if (return_code >= 0)
{
Expand Down
5 changes: 4 additions & 1 deletion rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp
Expand Up @@ -259,7 +259,10 @@ namespace rsx

if (const auto error = run_input_loop())
{
rsx_log.error("Dialog input loop exited with error code=%d", error);
if (error != selection_code::canceled)
{
rsx_log.error("User list dialog input loop exited with error code=%d", error);
}
}

thread_bits &= ~tbit;
Expand Down

0 comments on commit 11d2758

Please sign in to comment.