From 918984ee6494fd23d96117474fd57666eff6871f Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Wed, 20 Apr 2022 18:32:30 +0200
Subject: [PATCH] overlays: only log actual input loop errors

---
 rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp |  5 ++++-
 rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp    | 10 ++++++++--
 rpcs3/Emu/RSX/Overlays/overlay_osk.cpp               |  5 ++++-
 rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp       | 10 ++++++++--
 rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp  |  5 ++++-
 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp
index b6ab023c16..df73850eac 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp
@@ -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;
 			}
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
index ffab40ed00..ad5bfe3db0 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
@@ -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;
 					}
 				}
@@ -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
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
index 31edc1a172..dcc38e67f9 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
@@ -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;
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
index afac848a4a..d5ea050de9 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_save_dialog.cpp
@@ -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)
 			{
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp
index a00fe7a975..06aa6e8ceb 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_user_list_dialog.cpp
@@ -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;