V1.5.1.0 Release

SAMDestroy · SAMDestroy · commit 6d2dee5afc6d · 2026-05-26T21:15:47.000+02:00
diff --git a/AVRControl.Helpers.cs b/AVRControl.Helpers.cs
@@ -24,7 +24,7 @@ namespace AVRControl
 {
     public partial class AVRControl : Form
     {
-        private void timerProgress_Tick(object sender, EventArgs e)
+        private void timerProgress_Tick(object? sender, EventArgs e)
         {
             if (!IsAVROn) { return; }
 
diff --git a/AVRControl.HeosUI.cs b/AVRControl.HeosUI.cs
@@ -31,16 +31,15 @@ private async Task LoadAlbumArtAsync(string url)
 
             try
             {
-                using (var client = new System.Net.WebClient())
+                // Daten herunterladen
+                byte[] imageBytes = await _httpClient.GetByteArrayAsync(url);
+
+                using (var ms = new System.IO.MemoryStream(imageBytes))
                 {
-                    byte[] imageBytes = await client.DownloadDataTaskAsync(url);
-                    using (var ms = new System.IO.MemoryStream(imageBytes))
-                    {
-                        this.Invoke((MethodInvoker)delegate {
-                            pbAlbumArt.Image = Image.FromStream(ms);
-                            pbAlbumArt.SizeMode = PictureBoxSizeMode.Zoom;
-                        });
-                    }
+                    // Da wir 'await' nutzen, springt .NET automatisch zurück in den UI-Thread.
+                    // Ein 'this.Invoke' ist hier meistens gar nicht mehr nötig!
+                    pbAlbumArt.Image = Image.FromStream(ms);
+                    pbAlbumArt.SizeMode = PictureBoxSizeMode.Zoom;
                 }
             }
             catch (Exception ex)
diff --git a/AVRControl.Installer.cs b/AVRControl.Installer.cs
@@ -34,7 +34,7 @@ private void RefreshInstallState()
 
             isRunningFromRoaming = Application.ExecutablePath.Equals(roamingPath, StringComparison.OrdinalIgnoreCase);
 
-            using (RegistryKey key = Registry.CurrentUser.OpenSubKey(registryPath, false))
+            using (RegistryKey? key = Registry.CurrentUser.OpenSubKey(registryPath, false))
             {
                 if (key != null)
                 {
@@ -69,7 +69,7 @@ private void RefreshInstallState()
 
         // Github Update Part
         ////////////////////////////////////////////////////////////////////////////////////////////////////////
-        private async Task<Version> GetGitHubVersionAsync()
+        private async Task<Version?> GetGitHubVersionAsync()
         {
             string url = "https://api.github.com/repos/SAMDestroy/AVRControl/releases/latest";
 
@@ -105,7 +105,7 @@ private async Task<Version> GetGitHubVersionAsync()
         }
         private async void CheckForGitHubUpdate()
         {
-            Version githubVersion = await GetGitHubVersionAsync();
+            Version? githubVersion = await GetGitHubVersionAsync();
             //Version localVersion = typeof(Program).Assembly.GetName().Version;
             Version localVersion = new Version("1.5.0.0"); // lokal test
 
diff --git a/AVRControl.cs b/AVRControl.cs
@@ -28,9 +28,11 @@ public partial class AVRControl : Form
 
         private string roamingPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "AVRControl", "AVRControl.exe");
         private bool isRunningFromRoaming = false;
-        private string currentConfigPath;
+        private string currentConfigPath = string.Empty;
 
-        private readonly string config = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + "\\AVRControl.cfg";
+        private static readonly HttpClient _httpClient = new HttpClient();
+
+        private readonly string config = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "AVRControl.cfg");
         private bool _muted = false;
         private int CurVol = 10;
         private bool IsAVROn = false;
@@ -129,8 +131,8 @@ private void LoadDevice()
 
             try
             {
-                string savedIP = ConfigManager.GetValue(currentConfigPath, "IP");
-                string savedTray = ConfigManager.GetValue(currentConfigPath, "Systray");
+                string? savedIP = ConfigManager.GetValue(currentConfigPath, "IP");
+                string? savedTray = ConfigManager.GetValue(currentConfigPath, "Systray");
 
                 if (savedIP != null)
                 {
@@ -473,7 +475,7 @@ private void btnHeosPlayRepeatOne_MouseEnter(object sender, EventArgs e)
         }
         private void btnInstall_Click(object sender, EventArgs e)
         {
-            string targetDir = Path.GetDirectoryName(roamingPath);
+            string? targetDir = Path.GetDirectoryName(roamingPath);
             string registryPath = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Run";
 
             try
@@ -498,12 +500,15 @@ private void btnInstall_Click(object sender, EventArgs e)
                         return;
                     }
 
-                    if (!Directory.Exists(targetDir))
-                        Directory.CreateDirectory(targetDir);
+                    if (!string.IsNullOrEmpty(targetDir))
+                    {
+                        if (!Directory.Exists(targetDir))
+                            Directory.CreateDirectory(targetDir);
+                    }
 
                     System.IO.File.Copy(Application.ExecutablePath, roamingPath, true);
 
-                    string targetCfg = Path.Combine(targetDir, "AVRControl.cfg");
+                    string targetCfg = Path.Combine(targetDir!, "AVRControl.cfg");
                     if (!System.IO.File.Exists(targetCfg))
                     {
                         currentConfigPath = targetCfg;
@@ -512,7 +517,7 @@ private void btnInstall_Click(object sender, EventArgs e)
                         ConfigManager.SaveValue(currentConfigPath, "Systray", "TRUE");
                     }
 
-                    using (RegistryKey key = Registry.CurrentUser.OpenSubKey(registryPath, true))
+                    using (RegistryKey? key = Registry.CurrentUser.OpenSubKey(registryPath, true))
                     {
                         if (key != null) key.SetValue("AVRControl", $"\"{roamingPath}\"");
                     }
@@ -525,7 +530,7 @@ private void btnInstall_Click(object sender, EventArgs e)
                 }
                 else if (btnInstall.Text == "Uninstall")
                 {
-                    using (RegistryKey key = Registry.CurrentUser.OpenSubKey(registryPath, true))
+                    using (RegistryKey? key = Registry.CurrentUser.OpenSubKey(registryPath, true))
                     {
                         if (key != null) key.DeleteValue("AVRControl", false);
                     }
diff --git a/ConfigManager.cs b/ConfigManager.cs
@@ -26,12 +26,12 @@ public static string GetConfigPath(string roamingPath, bool isRunningFromRoaming
         {
             if (isRunningFromRoaming)
             {
-                return Path.Combine(Path.GetDirectoryName(roamingPath), "AVRControl.cfg");
+                return Path.Combine(Path.GetDirectoryName(roamingPath)!, "AVRControl.cfg");
             }
             return Path.Combine(Application.StartupPath, "AVRControl.cfg");
         }
 
-        public static string GetValue(string configPath, string key)
+        public static string? GetValue(string configPath, string key)
         {
             if (!File.Exists(configPath)) return null;
 
@@ -48,7 +48,7 @@ public static string GetValue(string configPath, string key)
 
         public static void SaveValue(string configPath, string key, string value)
         {
-            string dir = Path.GetDirectoryName(configPath);
+            string? dir = Path.GetDirectoryName(configPath);
             if (!string.IsNullOrEmpty(dir) && !Directory.Exists(dir))
                 Directory.CreateDirectory(dir);
 
diff --git a/TelnetClient.cs b/TelnetClient.cs
@@ -27,25 +27,25 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 
 public class AsyncTelnetClient
 {
-    private TcpClient _client;
-    private NetworkStream _stream;
+    private TcpClient? _client = null!;
+    private NetworkStream? _stream = null!;
     private bool _shouldReconnect = false;
     private bool _isConnecting = false;
     private DateTime _lastResponseTime = DateTime.UtcNow;
     public bool Initialized { get; private set; } = false;
 
-    private CancellationTokenSource _cts;
+    private CancellationTokenSource? _cts;
 
-    private string _IP;
+    private string _IP = null!;
 
     public int ConnectedPort { get; private set; }
 
     public bool DoStatusUpdates { get; set; }
 
-    public event Action<string> DataReceived;
-    public event Action<string> ErrorOccurred;
-    public event Action<string> StatusChanged;
-   
+    public event Action<string>? DataReceived;
+    public event Action<string>? ErrorOccurred;
+    public event Action<string>? StatusChanged;
+
     // XML Reader Part
     ////////////////////////////////////////////////////////////////////////////////////////////////////////
     public async Task<string> ReadXMLDeviceInfoAsync()
@@ -64,7 +64,7 @@ public async Task<string> ReadXMLDeviceInfoAsync()
                 var xmlDoc = new XmlDocument();
                 xmlDoc.LoadXml(liteXmlString);
 
-                var rawvalue = xmlDoc.DocumentElement.SelectSingleNode("//InputFuncSelect")?.InnerText;
+                var rawvalue = xmlDoc.DocumentElement?.SelectSingleNode("//InputFuncSelect")?.InnerText;
                 if (string.IsNullOrEmpty(rawvalue)) return "HEOS";
 
                 if (rawvalue == "NET") return "HEOS";

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace AVRControl`
`24`	`24`	`{`
`25`	`25`	`public partial class AVRControl : Form`
`26`	`26`	`{`
`27`		`- private void timerProgress_Tick(object sender, EventArgs e)`
	`27`	`+ private void timerProgress_Tick(object? sender, EventArgs e)`
`28`	`28`	`{`
`29`	`29`	`if (!IsAVROn) { return; }`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -31,16 +31,15 @@ private async Task LoadAlbumArtAsync(string url)`
`31`	`31`
`32`	`32`	`try`
`33`	`33`	`{`
`34`		`- using (var client = new System.Net.WebClient())`
	`34`	`+ // Daten herunterladen`
	`35`	`+ byte[] imageBytes = await _httpClient.GetByteArrayAsync(url);`
	`36`	`+`
	`37`	`+ using (var ms = new System.IO.MemoryStream(imageBytes))`
`35`	`38`	`{`
`36`		`- byte[] imageBytes = await client.DownloadDataTaskAsync(url);`
`37`		`- using (var ms = new System.IO.MemoryStream(imageBytes))`
`38`		`- {`
`39`		`- this.Invoke((MethodInvoker)delegate {`
`40`		`- pbAlbumArt.Image = Image.FromStream(ms);`
`41`		`- pbAlbumArt.SizeMode = PictureBoxSizeMode.Zoom;`
`42`		`- });`
`43`		`- }`
	`39`	`+ // Da wir 'await' nutzen, springt .NET automatisch zurück in den UI-Thread.`
	`40`	`+ // Ein 'this.Invoke' ist hier meistens gar nicht mehr nötig!`
	`41`	`+ pbAlbumArt.Image = Image.FromStream(ms);`
	`42`	`+ pbAlbumArt.SizeMode = PictureBoxSizeMode.Zoom;`
`44`	`43`	`}`
`45`	`44`	`}`
`46`	`45`	`catch (Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ private void RefreshInstallState()`
`34`	`34`
`35`	`35`	`isRunningFromRoaming = Application.ExecutablePath.Equals(roamingPath, StringComparison.OrdinalIgnoreCase);`
`36`	`36`
`37`		`- using (RegistryKey key = Registry.CurrentUser.OpenSubKey(registryPath, false))`
	`37`	`+ using (RegistryKey? key = Registry.CurrentUser.OpenSubKey(registryPath, false))`
`38`	`38`	`{`
`39`	`39`	`if (key != null)`
`40`	`40`	`{`
`@@ -69,7 +69,7 @@ private void RefreshInstallState()`
`69`	`69`
`70`	`70`	`// Github Update Part`
`71`	`71`	`////////////////////////////////////////////////////////////////////////////////////////////////////////`
`72`		`- private async Task<Version> GetGitHubVersionAsync()`
	`72`	`+ private async Task<Version?> GetGitHubVersionAsync()`
`73`	`73`	`{`
`74`	`74`	`string url = "https://api.github.com/repos/SAMDestroy/AVRControl/releases/latest";`
`75`	`75`
`@@ -105,7 +105,7 @@ private async Task<Version> GetGitHubVersionAsync()`
`105`	`105`	`}`
`106`	`106`	`private async void CheckForGitHubUpdate()`
`107`	`107`	`{`
`108`		`- Version githubVersion = await GetGitHubVersionAsync();`
	`108`	`+ Version? githubVersion = await GetGitHubVersionAsync();`
`109`	`109`	`//Version localVersion = typeof(Program).Assembly.GetName().Version;`
`110`	`110`	`Version localVersion = new Version("1.5.0.0"); // lokal test`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,11 @@ public partial class AVRControl : Form`
`28`	`28`
`29`	`29`	`private string roamingPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "AVRControl", "AVRControl.exe");`
`30`	`30`	`private bool isRunningFromRoaming = false;`
`31`		`- private string currentConfigPath;`
	`31`	`+ private string currentConfigPath = string.Empty;`
`32`	`32`
`33`		`- private readonly string config = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + "\\AVRControl.cfg";`
	`33`	`+ private static readonly HttpClient _httpClient = new HttpClient();`
	`34`	`+`
	`35`	`+ private readonly string config = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "AVRControl.cfg");`
`34`	`36`	`private bool _muted = false;`
`35`	`37`	`private int CurVol = 10;`
`36`	`38`	`private bool IsAVROn = false;`
`@@ -129,8 +131,8 @@ private void LoadDevice()`
`129`	`131`
`130`	`132`	`try`
`131`	`133`	`{`
`132`		`- string savedIP = ConfigManager.GetValue(currentConfigPath, "IP");`
`133`		`- string savedTray = ConfigManager.GetValue(currentConfigPath, "Systray");`
	`134`	`+ string? savedIP = ConfigManager.GetValue(currentConfigPath, "IP");`
	`135`	`+ string? savedTray = ConfigManager.GetValue(currentConfigPath, "Systray");`
`134`	`136`
`135`	`137`	`if (savedIP != null)`
`136`	`138`	`{`
`@@ -473,7 +475,7 @@ private void btnHeosPlayRepeatOne_MouseEnter(object sender, EventArgs e)`
`473`	`475`	`}`
`474`	`476`	`private void btnInstall_Click(object sender, EventArgs e)`
`475`	`477`	`{`
`476`		`- string targetDir = Path.GetDirectoryName(roamingPath);`
	`478`	`+ string? targetDir = Path.GetDirectoryName(roamingPath);`
`477`	`479`	`string registryPath = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Run";`
`478`	`480`
`479`	`481`	`try`
`@@ -498,12 +500,15 @@ private void btnInstall_Click(object sender, EventArgs e)`
`498`	`500`	`return;`
`499`	`501`	`}`
`500`	`502`
`501`		`- if (!Directory.Exists(targetDir))`
`502`		`- Directory.CreateDirectory(targetDir);`
	`503`	`+ if (!string.IsNullOrEmpty(targetDir))`
	`504`	`+ {`
	`505`	`+ if (!Directory.Exists(targetDir))`
	`506`	`+ Directory.CreateDirectory(targetDir);`
	`507`	`+ }`
`503`	`508`
`504`	`509`	`System.IO.File.Copy(Application.ExecutablePath, roamingPath, true);`
`505`	`510`
`506`		`- string targetCfg = Path.Combine(targetDir, "AVRControl.cfg");`
	`511`	`+ string targetCfg = Path.Combine(targetDir!, "AVRControl.cfg");`
`507`	`512`	`if (!System.IO.File.Exists(targetCfg))`
`508`	`513`	`{`
`509`	`514`	`currentConfigPath = targetCfg;`
`@@ -512,7 +517,7 @@ private void btnInstall_Click(object sender, EventArgs e)`
`512`	`517`	`ConfigManager.SaveValue(currentConfigPath, "Systray", "TRUE");`
`513`	`518`	`}`
`514`	`519`
`515`		`- using (RegistryKey key = Registry.CurrentUser.OpenSubKey(registryPath, true))`
	`520`	`+ using (RegistryKey? key = Registry.CurrentUser.OpenSubKey(registryPath, true))`
`516`	`521`	`{`
`517`	`522`	`if (key != null) key.SetValue("AVRControl", $"\"{roamingPath}\"");`
`518`	`523`	`}`
`@@ -525,7 +530,7 @@ private void btnInstall_Click(object sender, EventArgs e)`
`525`	`530`	`}`
`526`	`531`	`else if (btnInstall.Text == "Uninstall")`
`527`	`532`	`{`
`528`		`- using (RegistryKey key = Registry.CurrentUser.OpenSubKey(registryPath, true))`
	`533`	`+ using (RegistryKey? key = Registry.CurrentUser.OpenSubKey(registryPath, true))`
`529`	`534`	`{`
`530`	`535`	`if (key != null) key.DeleteValue("AVRControl", false);`
`531`	`536`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@ public static string GetConfigPath(string roamingPath, bool isRunningFromRoaming`
`26`	`26`	`{`
`27`	`27`	`if (isRunningFromRoaming)`
`28`	`28`	`{`
`29`		`- return Path.Combine(Path.GetDirectoryName(roamingPath), "AVRControl.cfg");`
	`29`	`+ return Path.Combine(Path.GetDirectoryName(roamingPath)!, "AVRControl.cfg");`
`30`	`30`	`}`
`31`	`31`	`return Path.Combine(Application.StartupPath, "AVRControl.cfg");`
`32`	`32`	`}`
`33`	`33`
`34`		`- public static string GetValue(string configPath, string key)`
	`34`	`+ public static string? GetValue(string configPath, string key)`
`35`	`35`	`{`
`36`	`36`	`if (!File.Exists(configPath)) return null;`
`37`	`37`
`@@ -48,7 +48,7 @@ public static string GetValue(string configPath, string key)`
`48`	`48`
`49`	`49`	`public static void SaveValue(string configPath, string key, string value)`
`50`	`50`	`{`
`51`		`- string dir = Path.GetDirectoryName(configPath);`
	`51`	`+ string? dir = Path.GetDirectoryName(configPath);`
`52`	`52`	`if (!string.IsNullOrEmpty(dir) && !Directory.Exists(dir))`
`53`	`53`	`Directory.CreateDirectory(dir);`
`54`	`54`