Merge pull request #72 from micahmo/release/v2.0.5

Release/v2.0.5
micahmo · Jan 5, 2023 · 151d258 · 151d258
2 parents 6b97a5a + e7f2a90
commit 151d258
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup>
         <!-- Keep in sync with WS4WSetupScript.iss and VersionInfo.xml -->
-        <AssemblyVersion>2.0.4.0</AssemblyVersion>
-        <FileVersion>2.0.4.0</FileVersion>
-        <InformationalVersion>2.0.4.0</InformationalVersion>
+        <AssemblyVersion>2.0.5.0</AssemblyVersion>
+        <FileVersion>2.0.5.0</FileVersion>
+        <InformationalVersion>2.0.5.0</InformationalVersion>
         <Authors>Micah Morrison</Authors>
         <Product>WS4W</Product>
     </PropertyGroup>

diff --git a/Installer/WS4WSetupScript.iss b/Installer/WS4WSetupScript.iss
@@ -1,6 +1,6 @@
 #define MyAppNameOld "WireGuard Server For Windows"
 #define MyAppName "Wg Server for Windows"
-#define MyAppVersion "2.0.4"
+#define MyAppVersion "2.0.5"
 #define MyAppPublisher "Micah Morrison"
 #define MyAppURL "https://github.com/micahmo/WgServerforWindows"
 #define MyAppExeName "WgServerforWindows.exe"

diff --git a/WgServerforWindows/Models/ClientConfiguration.cs b/WgServerforWindows/Models/ClientConfiguration.cs
@@ -57,14 +57,14 @@ public ClientConfiguration(ClientConfigurationList parentList)
                         .Select(a => IPNetwork.Parse(a.Trim()))
                         .ToList(); // Prevent multiple enumeration
 
-                    var currentClientAddresses = prop.Value
+                    var currentClientAddresses = (prop.Value?
                         .Split(',')
                         .Select(a =>
                         {
                             IPAddress.TryParse(a.Trim(), out var address);
                             return address;
                         })
-                        .Where(a => a != null)
+                        .Where(a => a != null) ?? Enumerable.Empty<IPAddress>())
                         .ToList(); // Prevent multiple enumeration
 
                     var newClientAddresses = new HashSet<string>();

diff --git a/WgServerforWindows/Models/UnhandledErrorWindowModel.cs b/WgServerforWindows/Models/UnhandledErrorWindowModel.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Windows;
 using System.Windows.Input;
 using GalaSoft.MvvmLight;
@@ -42,7 +44,18 @@ public Exception Exception
                 exception = exception.InnerException;
             }
 
-            Clipboard.SetText(exceptionText.ToString());
+            // This can help to alleviate issues opening the clipboard like CLIPBRD_E_CANT_OPEN
+            // See: https://stackoverflow.com/a/69081 
+            foreach (var _ in Enumerable.Range(0, 10))
+            {
+                try
+                {
+                    Clipboard.SetText(exceptionText.ToString());
+                    break;
+                }
+                catch { }
+                Thread.Sleep(10);
+            }
         });
         private RelayCommand _copyErrorCommand;
     }

diff --git a/WireGuardServerForWindows/VersionInfo2.xml b/WireGuardServerForWindows/VersionInfo2.xml
@@ -2,12 +2,12 @@
 <!-- Things to update: Version, Date, Release Notes -->
 <AppUpdate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/micahmo/WgServerforWindows/master/WireGuardServerForWindows/AppUpdate.xsd">
-  <Version>2.0.4.0</Version>
-  <ReleaseDate>2022-12-31</ReleaseDate>
+  <Version>2.0.5.0</Version>
+  <ReleaseDate>2023-01-05</ReleaseDate>
   <!-- Default download -->
-  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.0.4/WS4WSetup-2.0.4.exe</DownloadLink>
-  <DownloadFileName>WS4WSetup-2.0.4.exe</DownloadFileName>
+  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.0.5/WS4WSetup-2.0.5.exe</DownloadLink>
+  <DownloadFileName>WS4WSetup-2.0.5.exe</DownloadFileName>
   <!-- Release notes -->
-  <VersionNotes> - Add support for generating client addresses from mulitple server address subnets (#67 and #68). Thanks @xeptore!</VersionNotes>
+  <VersionNotes> - Fix issue with generating client addresses (#70)</VersionNotes>
   <ReleaseNotes></ReleaseNotes>
 </AppUpdate>