Merge pull request #66 from yfdyh000/fixcrash

Fix startup crash
DavidMoore · Apr 18, 2020 · e0ffba3 · e0ffba3
2 parents 708c12f + bd58736
commit e0ffba3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/Code/IPFilter/Apps/DelugeApplication.cs b/Code/IPFilter/Apps/DelugeApplication.cs
@@ -50,16 +50,18 @@ public Task<ApplicationDetectionResult> DetectAsync()
                 var result = ApplicationDetectionResult.Create(this, "Deluge", Path.GetDirectoryName(path));
 
                 var exe = new FileInfo(path);
-                if (!exe.Exists)
+                if (exe.Exists)
+                {
+                    var version = FileVersionInfo.GetVersionInfo(exe.FullName);
+                    result.Description = version.ProductName;
+                    result.Version = version.FileVersion;
+                }
+                else
                 {
                     Trace.TraceInformation("Deluge exe not found @ " + path);
                     result.IsPresent = false;
                 }
 
-                var version = FileVersionInfo.GetVersionInfo(exe.FullName);
-                result.Description = version.ProductName;
-                result.Version = version.FileVersion;
-
                 return Task.FromResult(result);
             }
 

diff --git a/Code/IPFilter/Apps/EmuleApplication.cs b/Code/IPFilter/Apps/EmuleApplication.cs
@@ -29,12 +29,17 @@ public Task<ApplicationDetectionResult> DetectAsync()
                 var result = ApplicationDetectionResult.Create(this, DefaultDisplayName, installLocation);
 
                 var exe = new FileInfo(Path.Combine(installLocation, "emule.exe"));
-                if (!exe.Exists) result.IsPresent = false;
+                if (exe.Exists)
+                {
+                    var version = FileVersionInfo.GetVersionInfo(exe.FullName);
+                    result.Description = version.ProductName;
+                    result.Version = version.FileVersion;
+                }
+                else
+                {
+                    result.IsPresent = false;
+                }
 
-                var version = FileVersionInfo.GetVersionInfo(exe.FullName);
-                result.Description = version.ProductName;
-                result.Version = version.FileVersion;
-
                 return Task.FromResult(result);
             }
         }