From a77edc6436fff215ecd8ed680630c65864e1607a Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Sun, 7 Feb 2021 03:27:37 +1000 Subject: [PATCH] Settings: Default console logging on Android to on --- src/core/host_interface.cpp | 2 +- src/core/settings.cpp | 2 +- src/core/settings.h | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/core/host_interface.cpp b/src/core/host_interface.cpp index a962f65ee..dbf24c4bb 100644 --- a/src/core/host_interface.cpp +++ b/src/core/host_interface.cpp @@ -582,7 +582,7 @@ void HostInterface::SetDefaultSettings(SettingsInterface& si) si.SetStringValue("Logging", "LogLevel", Settings::GetLogLevelName(Settings::DEFAULT_LOG_LEVEL)); si.SetStringValue("Logging", "LogFilter", ""); - si.SetBoolValue("Logging", "LogToConsole", false); + si.SetBoolValue("Logging", "LogToConsole", Settings::DEFAULT_LOG_TO_CONSOLE); si.SetBoolValue("Logging", "LogToDebug", false); si.SetBoolValue("Logging", "LogToWindow", false); si.SetBoolValue("Logging", "LogToFile", false); diff --git a/src/core/settings.cpp b/src/core/settings.cpp index e7b710564..31c474c9a 100644 --- a/src/core/settings.cpp +++ b/src/core/settings.cpp @@ -253,7 +253,7 @@ void Settings::Load(SettingsInterface& si) log_level = ParseLogLevelName(si.GetStringValue("Logging", "LogLevel", GetLogLevelName(DEFAULT_LOG_LEVEL)).c_str()) .value_or(DEFAULT_LOG_LEVEL); log_filter = si.GetStringValue("Logging", "LogFilter", ""); - log_to_console = si.GetBoolValue("Logging", "LogToConsole", false); + log_to_console = si.GetBoolValue("Logging", "LogToConsole", DEFAULT_LOG_TO_CONSOLE); log_to_debug = si.GetBoolValue("Logging", "LogToDebug", false); log_to_window = si.GetBoolValue("Logging", "LogToWindow", false); log_to_file = si.GetBoolValue("Logging", "LogToFile", false); diff --git a/src/core/settings.h b/src/core/settings.h index be049fddc..5b4b2b42a 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -357,6 +357,13 @@ struct Settings static constexpr MemoryCardType DEFAULT_MEMORY_CARD_1_TYPE = MemoryCardType::PerGameTitle; static constexpr MemoryCardType DEFAULT_MEMORY_CARD_2_TYPE = MemoryCardType::None; static constexpr LOGLEVEL DEFAULT_LOG_LEVEL = LOGLEVEL_INFO; + + // Enable console logging by default on Linux platforms. +#if defined(__linux__) && !defined(__ANDROID__) + static constexpr bool DEFAULT_LOG_TO_CONSOLE = true; +#else + static constexpr bool DEFAULT_LOG_TO_CONSOLE = false; +#endif }; extern Settings g_settings;