diff options
Diffstat (limited to 'Ryujinx.Common/Configuration')
| -rw-r--r-- | Ryujinx.Common/Configuration/ConfigurationState.cs | 26 | ||||
| -rw-r--r-- | Ryujinx.Common/Configuration/LoggerModule.cs | 20 |
2 files changed, 13 insertions, 33 deletions
diff --git a/Ryujinx.Common/Configuration/ConfigurationState.cs b/Ryujinx.Common/Configuration/ConfigurationState.cs index dc9dd659..489382cd 100644 --- a/Ryujinx.Common/Configuration/ConfigurationState.cs +++ b/Ryujinx.Common/Configuration/ConfigurationState.cs @@ -532,7 +532,7 @@ namespace Ryujinx.Configuration if (configurationFileFormat.Version < 0 || configurationFileFormat.Version > ConfigurationFileFormat.CurrentVersion) { - Common.Logging.Logger.PrintWarning(LogClass.Application, $"Unsupported configuration version {configurationFileFormat.Version}, loading default."); + Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Unsupported configuration version {configurationFileFormat.Version}, loading default."); LoadDefault(); @@ -541,7 +541,7 @@ namespace Ryujinx.Configuration if (configurationFileFormat.Version < 2) { - Common.Logging.Logger.PrintWarning(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 2."); + Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 2."); configurationFileFormat.SystemRegion = Region.USA; @@ -550,7 +550,7 @@ namespace Ryujinx.Configuration if (configurationFileFormat.Version < 3) { - Common.Logging.Logger.PrintWarning(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 3."); + Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 3."); configurationFileFormat.SystemTimeZone = "UTC"; @@ -559,7 +559,7 @@ namespace Ryujinx.Configuration if (configurationFileFormat.Version < 4) { - Common.Logging.Logger.PrintWarning(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 4."); + Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 4."); configurationFileFormat.MaxAnisotropy = -1; @@ -568,7 +568,7 @@ namespace Ryujinx.Configuration if (configurationFileFormat.Version < 5) { - Common.Logging.Logger.PrintWarning(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 5."); + Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 5."); configurationFileFormat.SystemTimeOffset = 0; @@ -577,7 +577,7 @@ namespace Ryujinx.Configuration if (configurationFileFormat.Version < 6) { - Common.Logging.Logger.PrintWarning(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 6."); + Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 6."); configurationFileFormat.ControllerConfig = new List<ControllerConfig>(); configurationFileFormat.KeyboardConfig = new List<KeyboardConfig> @@ -630,7 +630,7 @@ namespace Ryujinx.Configuration // Only needed for version 6 configurations. if (configurationFileFormat.Version == 6) { - Common.Logging.Logger.PrintWarning(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 7."); + Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 7."); for (int i = 0; i < configurationFileFormat.KeyboardConfig.Count; i++) { @@ -643,7 +643,7 @@ namespace Ryujinx.Configuration if (configurationFileFormat.Version < 8) { - Common.Logging.Logger.PrintWarning(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 8."); + Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 8."); configurationFileFormat.EnablePtc = false; @@ -652,7 +652,7 @@ namespace Ryujinx.Configuration if (configurationFileFormat.Version < 9) { - Common.Logging.Logger.PrintWarning(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 9."); + Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 9."); configurationFileFormat.ColumnSort = new ColumnSort { @@ -670,7 +670,7 @@ namespace Ryujinx.Configuration if (configurationFileFormat.Version < 10) { - Common.Logging.Logger.PrintWarning(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 10."); + Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 10."); configurationFileFormat.AudioBackend = AudioBackend.OpenAl; @@ -679,7 +679,7 @@ namespace Ryujinx.Configuration if (configurationFileFormat.Version < 11) { - Common.Logging.Logger.PrintWarning(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 11."); + Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 11."); configurationFileFormat.ResScale = 1; configurationFileFormat.ResScaleCustom = 1.0f; @@ -689,7 +689,7 @@ namespace Ryujinx.Configuration if (configurationFileFormat.Version < 12) { - Common.Logging.Logger.PrintWarning(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 12."); + Common.Logging.Logger.Warning?.Print(LogClass.Application, $"Outdated configuration version {configurationFileFormat.Version}, migrating to version 12."); configurationFileFormat.LoggingGraphicsDebugLevel = GraphicsDebugLevel.None; @@ -750,7 +750,7 @@ namespace Ryujinx.Configuration { ToFileFormat().SaveConfig(configurationFilePath); - Common.Logging.Logger.PrintWarning(LogClass.Application, "Configuration file has been updated!"); + Common.Logging.Logger.Warning?.Print(LogClass.Application, "Configuration file has been updated!"); } } diff --git a/Ryujinx.Common/Configuration/LoggerModule.cs b/Ryujinx.Common/Configuration/LoggerModule.cs index 058bea5b..20c0fb46 100644 --- a/Ryujinx.Common/Configuration/LoggerModule.cs +++ b/Ryujinx.Common/Configuration/LoggerModule.cs @@ -9,9 +9,6 @@ namespace Ryujinx.Configuration { public static void Initialize() { - AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; - AppDomain.CurrentDomain.ProcessExit += CurrentDomain_ProcessExit; - ConfigurationState.Instance.Logger.EnableDebug.Event += ReloadEnableDebug; ConfigurationState.Instance.Logger.EnableStub.Event += ReloadEnableStub; ConfigurationState.Instance.Logger.EnableInfo.Event += ReloadEnableInfo; @@ -88,22 +85,5 @@ namespace Ryujinx.Configuration Logger.RemoveTarget("file"); } } - - private static void CurrentDomain_ProcessExit(object sender, EventArgs e) - { - Logger.Shutdown(); - } - - private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) - { - var exception = e.ExceptionObject as Exception; - - Logger.PrintError(LogClass.Emulation, $"Unhandled exception caught: {exception}"); - - if (e.IsTerminating) - { - Logger.Shutdown(); - } - } } } |