From e85dcc39d65b40baa535d08271b8f820fd5ac78f Mon Sep 17 00:00:00 2001 From: Markus Hofknecht Date: Sat, 24 Oct 2020 22:31:56 +0200 Subject: [PATCH] [BUG] Fix get correct network path if it contains a space (#140), version 1.0.17.6 --- Business/Menus.cs | 4 ++-- Properties/AssemblyInfo.cs | 4 ++-- Utilities/Log.cs | 12 ++++++------ app.config | 19 ------------------- 4 files changed, 10 insertions(+), 29 deletions(-) diff --git a/Business/Menus.cs b/Business/Menus.cs index 410b53f..ce6347b 100644 --- a/Business/Menus.cs +++ b/Business/Menus.cs @@ -310,12 +310,12 @@ namespace SystemTrayMenu.Business { foreach (string line in lines.Skip(6).SkipLast(2)) { - int indexOfFirstSpace = line.TrimEnd().LastIndexOf(" ", StringComparison.InvariantCulture); + int indexOfFirstSpace = line.IndexOf(" ", StringComparison.InvariantCulture); if (indexOfFirstSpace > 0) { string directory = Path.Combine( networkLocationRootPath, - line.Substring(0, indexOfFirstSpace)).TrimEnd(); + line.Substring(0, indexOfFirstSpace)); directories.Add(directory); resolvedSomething = true; diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 242cccd..107d37a 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -39,5 +39,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.17.5")] -[assembly: AssemblyFileVersion("1.0.17.5")] +[assembly: AssemblyVersion("1.0.17.6")] +[assembly: AssemblyFileVersion("1.0.17.6")] diff --git a/Utilities/Log.cs b/Utilities/Log.cs index 6b61618..f9b5ca2 100644 --- a/Utilities/Log.cs +++ b/Utilities/Log.cs @@ -16,8 +16,8 @@ namespace SystemTrayMenu.Utilities internal static class Log { private static readonly Logger LogValue = new Logger(string.Empty); - private static List warnings = new List(); - private static List infos = new List(); + private static readonly List Warnings = new List(); + private static readonly List Infos = new List(); internal static void Initialize() { @@ -26,9 +26,9 @@ namespace SystemTrayMenu.Utilities internal static void Info(string message) { - if (!infos.Contains(message)) + if (!Infos.Contains(message)) { - infos.Add(message); + Infos.Add(message); LogValue.Info(message); } } @@ -36,9 +36,9 @@ namespace SystemTrayMenu.Utilities internal static void Warn(string message, Exception ex) { string warning = $"{message} {ex.ToString().Replace(Environment.NewLine, " ", StringComparison.InvariantCulture)}"; - if (!warnings.Contains(warning)) + if (!Warnings.Contains(warning)) { - warnings.Add(warning); + Warnings.Add(warning); LogValue.Warn(warning); } } diff --git a/app.config b/app.config index 6042527..5656d64 100644 --- a/app.config +++ b/app.config @@ -5,23 +5,4 @@
- - - - - - - - - - False - - - Ctrl+Alt+Apps - - - False - - - \ No newline at end of file