Merge pull request #4 from theace0296/master

Made checks for both versions to stop exception when battlenet version doesn't exist

Author: John Dong

DOOMSaveManager.csproj

@@ -48,8 +48,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto">
-      <HintPath>lib\BouncyCastle.Crypto.dll</HintPath>
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
+      <HintPath>packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>

DoomEternal.cs

@@ -21,18 +21,22 @@ public class DoomEternal
 
         public static void EnumerateSaves() {
             Saves = new DoomEternalSaveCollection();
-            foreach(var single in Directory.GetDirectories(BnetSavePath, "*.*", SearchOption.TopDirectoryOnly)) {
-                if(Utilities.CheckUUID(Path.GetFileNameWithoutExtension(single)))
-                    Saves.Add(new DoomEternalSave(Path.GetFileNameWithoutExtension(single), BnetSavePath, DoomEternalSavePlatform.BethesdaNet));
+            if (Directory.Exists(BnetSavePath)) {
+                Saves.Add(new DoomEternalSave("savegame.unencrypted", BnetSavePath, DoomEternalSavePlatform.BethesdaNet));
+                foreach (var single in Directory.GetDirectories(BnetSavePath, "*.*", SearchOption.TopDirectoryOnly)) {
+                    if (Utilities.CheckUUID(Path.GetFileNameWithoutExtension(single)))
+                        Saves.Add(new DoomEternalSave(Path.GetFileNameWithoutExtension(single), BnetSavePath, DoomEternalSavePlatform.BethesdaNet));
+                }
             }
-            foreach(var steamId3 in Directory.GetDirectories(SteamSavePath, "*.*", SearchOption.TopDirectoryOnly)) {
-                Console.WriteLine(Path.GetFileNameWithoutExtension(steamId3));
-                foreach(var single in Directory.GetDirectories(steamId3, "*.*", SearchOption.TopDirectoryOnly)) {
-                    if (Path.GetFileNameWithoutExtension(single) == SteamGameID.ToString())
-                        Saves.Add(new DoomEternalSave((int.Parse(Path.GetFileNameWithoutExtension(steamId3)) + 76561197960265728).ToString(), SteamSavePath, DoomEternalSavePlatform.Steam));
+            if (Directory.Exists(SteamSavePath)) {
+                foreach (var steamId3 in Directory.GetDirectories(SteamSavePath, "*.*", SearchOption.TopDirectoryOnly)) {
+                    Console.WriteLine(Path.GetFileNameWithoutExtension(steamId3));
+                    foreach (var single in Directory.GetDirectories(steamId3, "*.*", SearchOption.TopDirectoryOnly)) {
+                        if (Path.GetFileNameWithoutExtension(single) == SteamGameID.ToString())
+                            Saves.Add(new DoomEternalSave((int.Parse(Path.GetFileNameWithoutExtension(steamId3)) + 76561197960265728).ToString(), SteamSavePath, DoomEternalSavePlatform.Steam));
+                    }
                 }
             }
-            Saves.Add(new DoomEternalSave("savegame.unencrypted", BnetSavePath, DoomEternalSavePlatform.BethesdaNet));
         }
 
         #region Bethesda.net
@@ -153,4 +157,4 @@ public static void SteamToBnetTransfer(string fromId, string toId) {
         }
         #endregion
     }
-}
+}

Form1.cs

@@ -15,7 +15,7 @@ private void Form1_Load(object sender, EventArgs e) {
             DoomEternal.EnumerateSaves();
             bool res = false;
             // add tabs back if the games exist
-            if(Directory.Exists(DoomEternal.BnetSavePath)) {
+            if(Directory.Exists(DoomEternal.BnetSavePath) || Directory.Exists(DoomEternal.SteamSavePath)) {
                 res = true;
             }
             if(!res) {

packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="BouncyCastle" version="1.8.5" targetFramework="net472" />
   <package id="SharpZipLib" version="1.2.0" targetFramework="net472" />
 </packages>