From bed0527c1a7a24e0231fc8e5a9f048fc78a63337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 Jan 2025 01:28:52 +0100 Subject: [PATCH 1/2] Deduplicate "Failed to bind port" messages (one was missing) --- Core/HLE/proAdhocServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/HLE/proAdhocServer.cpp b/Core/HLE/proAdhocServer.cpp index f01e46d27b..e86a0033b4 100644 --- a/Core/HLE/proAdhocServer.cpp +++ b/Core/HLE/proAdhocServer.cpp @@ -1833,7 +1833,7 @@ int create_listen_socket(uint16_t port) else { ERROR_LOG(Log::sceNet, "AdhocServer: Bind returned %i (Socket error %d)", bindresult, socket_errno); auto n = GetI18NCategory(I18NCat::NETWORKING); - g_OSD.Show(OSDType::MESSAGE_ERROR, std::string(n->T("AdhocServer Failed to Bind Port")) + " " + std::to_string(port)); + g_OSD.Show(OSDType::MESSAGE_ERROR, std::string(n->T("AdhocServer Failed to Bind Port")) + " " + std::to_string(port), "portbindfail"); } // Close Socket From 68dfd8df444cb8c8837932b18d21e30230254913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 10 Jan 2025 01:35:59 +0100 Subject: [PATCH 2/2] Logging: Only disable DEBUG logs on Android/iOS release builds (previously: all release builds except Windows) --- Common/Log.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Common/Log.h b/Common/Log.h index 158e7e0c19..c10a342f2f 100644 --- a/Common/Log.h +++ b/Common/Log.h @@ -17,6 +17,7 @@ #pragma once +#include "ppsspp_config.h" #include "CommonFuncs.h" #define NOTICE_LEVEL 1 // VERY important information that is NOT errors. Like startup and debugprintfs from the game itself. @@ -84,8 +85,8 @@ void GenericLog(LogLevel level, Log type, const char *file, int line, const char ; bool GenericLogEnabled(LogLevel level, Log type); -// Exception for Windows - enable more log levels in release mode than on other platforms. -#if defined(_DEBUG) || defined(_WIN32) +// We only disable DEBUG and VERBOSE on Android/iOS now. +#if defined(_DEBUG) || (!PPSSPP_PLATFORM(ANDROID) && !PPSSPP_PLATFORM(IOS)) // Needs to be an int (and not use the enum) because it's used by the preprocessor! #define MAX_LOGLEVEL DEBUG_LEVEL