diff --git a/installer/DesktopMagic-Installer.exe b/installer/DesktopMagic-Installer.exe
index e7da8f6..a9e65e1 100644
Binary files a/installer/DesktopMagic-Installer.exe and b/installer/DesktopMagic-Installer.exe differ
diff --git a/src/DesktopMagic/App.xaml.cs b/src/DesktopMagic/App.xaml.cs
index 66044cb..25550da 100644
--- a/src/DesktopMagic/App.xaml.cs
+++ b/src/DesktopMagic/App.xaml.cs
@@ -2,6 +2,8 @@
using AlwaysUpToDate;
+using Stone_Red_C_Sharp_Utilities.Logging;
+
using System;
using System.IO;
using System.Threading;
@@ -29,16 +31,7 @@ public partial class App : Application
private readonly Logger logger = new Logger();
public static string ApplicationDataPath { get; } = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "StoneRed", AppName);
- public static Logger Logger
- {
- get
- {
- lock (Current)
- {
- return ((App)Current).logger;
- }
- }
- }
+ public static Logger Logger => ((App)Current).logger;
public App()
{
@@ -143,7 +136,7 @@ public partial class App : Application
},
FormatConfig = new FormatConfig()
{
- DebugConsoleFormat = $"> {{{LogFormatType.DateTime}:hh:mm:ss}} | {{{LogFormatType.LogSeverity},-5}} | {{{LogFormatType.Message}}}\nat {{{LogFormatType.LineNumber}}} | {{{LogFormatType.FilePath}}}"
+ DebugConsoleFormat = $"> {{{LogFormatType.DateTime}:HH:mm:ss}} | {{{LogFormatType.LogSeverity},-5}} | {{{LogFormatType.Message}}}\nat {{{LogFormatType.LineNumber}}} | {{{LogFormatType.FilePath}}}"
}
};
diff --git a/src/DesktopMagic/DesktopMagic.csproj b/src/DesktopMagic/DesktopMagic.csproj
index 1c7b8bf..61a4b9a 100644
--- a/src/DesktopMagic/DesktopMagic.csproj
+++ b/src/DesktopMagic/DesktopMagic.csproj
@@ -38,11 +38,10 @@
-
-
+
diff --git a/src/DesktopMagic/Helpers/SampleAggregator.cs b/src/DesktopMagic/Helpers/SampleAggregator.cs
index 46dae3f..38d68e9 100644
--- a/src/DesktopMagic/Helpers/SampleAggregator.cs
+++ b/src/DesktopMagic/Helpers/SampleAggregator.cs
@@ -7,7 +7,7 @@ namespace DesktopMagic.Helpers;
internal class SampleAggregator
{
// FFT
- public event EventHandler FftCalculated;
+ public event EventHandler? FftCalculated;
// This Complex is NAudio's own!
private readonly Complex[] fftBuffer;
diff --git a/src/DesktopMagic/MainWindow.xaml.cs b/src/DesktopMagic/MainWindow.xaml.cs
index faf53bd..4dcf35d 100644
--- a/src/DesktopMagic/MainWindow.xaml.cs
+++ b/src/DesktopMagic/MainWindow.xaml.cs
@@ -5,8 +5,6 @@ using DesktopMagic.Helpers;
using DesktopMagic.Plugins;
using DesktopMagic.Settings;
-using Stone_Red_Utilities.StringExtentions;
-
using System;
using System.Collections.Generic;
using System.Diagnostics;