Bug fix reading in cfg when no time set for restart

winglessraven · Sep 3, 2020 · 463c74d · 463c74d
1 parent 0b6cfa7
commit 463c74d
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 7 deletions.
diff --git a/Dead Matter Server Manager/.vs/Dead Matter Server Manager/v16/.suo b/Dead Matter Server Manager/.vs/Dead Matter Server Manager/v16/.suo
diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/Form1.cs b/Dead Matter Server Manager/Dead Matter Server Manager/Form1.cs
@@ -170,7 +170,14 @@ private void CheckAppData()
                     if (s.StartsWith("TimerRestartTime"))
                     {
                         String[] temp = s.Split('=');
-                        restartServerTime.Text = Convert.ToString(Convert.ToDouble(temp[1]) * 60);
+                        try
+                        {
+                            restartServerTime.Text = Convert.ToString(Convert.ToDouble(temp[1]) * 60);
+                        }
+                        catch
+                        {
+                            //do nowt
+                        }
                     }
 
                     if (s.StartsWith("MinsTimerRestartTime"))

diff --git a/Dead Matter Server Manager/Dead Matter Server Manager/Properties/AssemblyInfo.cs b/Dead Matter Server Manager/Dead Matter Server Manager/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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.6.12.0")]
-[assembly: AssemblyFileVersion("1.6.12.0")]
+[assembly: AssemblyVersion("1.6.13.0")]
+[assembly: AssemblyFileVersion("1.6.13.0")]
diff --git a/...er Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.exe b/...er Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.exe
diff --git a/...er Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.pdb b/...er Server Manager/Dead Matter Server Manager/bin/x64/Debug/Dead Matter Server Manager.pdb
diff --git a/...ter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csproj.GenerateResource.cache b/...ter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csproj.GenerateResource.cache
diff --git a/...ter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csprojAssemblyReference.cache b/...ter Server Manager/obj/x64/Debug/Dead Matter Server Manager.csprojAssemblyReference.cache
diff --git a/...er Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.exe b/...er Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.exe
diff --git a/...er Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.pdb b/...er Server Manager/Dead Matter Server Manager/obj/x64/Debug/Dead Matter Server Manager.pdb
diff --git a/...r Server Manager/DeadMatterServerManagerInstaller/DeadMatterServerManagerInstaller.vdproj b/...r Server Manager/DeadMatterServerManagerInstaller/DeadMatterServerManagerInstaller.vdproj
@@ -529,15 +529,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Dead Matter Server Manager"
-        "ProductCode" = "8:{FEC110B2-AA52-42AB-B5BD-AFB7045DF93F}"
-        "PackageCode" = "8:{EF4A9CAD-3A2D-478B-A761-A9AE6C721B90}"
+        "ProductCode" = "8:{EDFCAA39-1F4E-4966-96CF-6061F15E0523}"
+        "PackageCode" = "8:{B92DE7C4-74A1-4F65-8ACD-3EAFEB0034E6}"
         "UpgradeCode" = "8:{BC345328-E944-4F2F-9559-E95043070B11}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.6.12"
+        "ProductVersion" = "8:1.6.13"
         "Manufacturer" = "8:winglessraven"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -546,7 +546,7 @@
         "ARPCONTACT" = "8:Dave Ross"
         "Keywords" = "8:"
         "ARPCOMMENTS" = "8:Dead Matter Server Manager"
-        "ARPURLINFOABOUT" = "8:www.winglessraven.com"
+        "ARPURLINFOABOUT" = "8:www.winglessraven.com/DMSM"
         "ARPPRODUCTICON" = "8:_06460ADA370849B79DB9F36DEE9D1A94"
         "ARPIconIndex" = "3:0"
         "SearchPath" = "8:"

diff --git a/... Matter Server Manager/DeadMatterServerManagerInstaller/Debug/DeadMatterServerManager.msi b/... Matter Server Manager/DeadMatterServerManagerInstaller/Debug/DeadMatterServerManager.msi