minor tweaks

Author: tomysshadow

FlashpointSecurePlayer/ActiveXControl.cs

@@ -43,15 +43,17 @@ public ActiveXControl(string libFileName) {
         }
 
         ~ActiveXControl() {
-            if (moduleHandle != IntPtr.Zero) {
-                try {
-                    if (!FreeLibrary(moduleHandle)) {
-                        Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error());
-                        return;
-                    }
-                } catch (Exception ex) {
-                    LogExceptionToLauncher(ex);
+            if (moduleHandle == IntPtr.Zero) {
+                return;
+            }
+
+            try {
+                if (!FreeLibrary(moduleHandle)) {
+                    Marshal.ThrowExceptionForHR(Marshal.GetHRForLastWin32Error());
+                    return;
                 }
+            } catch (Exception ex) {
+                LogExceptionToLauncher(ex);
             }
         }
 

FlashpointSecurePlayer/Shared.cs

@@ -2193,15 +2193,17 @@ public static StringBuilder GetWindowsVersionName(bool edition = false, bool ser
         */
 
         public static void HandleAntecedentTask(Task antecedentTask) {
-            if (antecedentTask.IsFaulted) {
-                Exception ex = antecedentTask.Exception;
+            if (!antecedentTask.IsFaulted) {
+                return;
+            }
 
-                while (ex is AggregateException && ex.InnerException != null) {
-                    ex = ex.InnerException;
-                }
+            Exception ex = antecedentTask.Exception;
 
-                throw ex;
+            while (ex is AggregateException && ex.InnerException != null) {
+                ex = ex.InnerException;
             }
+
+            throw ex;
         }
 
         public static async Task<Uri> DownloadAsync(string name) {
@@ -2376,8 +2378,8 @@ private static Configuration GetEXEConfiguration(bool create, string name) {
                     Exceptions.LogExceptionToLauncher(ex2);
                     throw new ConfigurationErrorsException("The EXE Configuration is in use.");
                 }
-            } catch (IOException ex2) {
-                Exceptions.LogExceptionToLauncher(ex2);
+            } catch (IOException ex) {
+                Exceptions.LogExceptionToLauncher(ex);
                 throw new ConfigurationErrorsException("The EXE Configuration is in use.");
             }
 

FlashpointSecurePlayer/WebBrowserMode.cs

@@ -22,7 +22,6 @@ public partial class WebBrowserMode : Form {
         private IntPtr mouseHook = IntPtr.Zero;
 
         private IntPtr LowLevelMouseProc(int nCode, IntPtr wParam, IntPtr lParam) {
-            // we don't want errors to prevent passing the window message
             try {
                 if (nCode >= 0) {
                     // always confirm the message first so we don't do unnecessary work
@@ -52,7 +51,7 @@ private IntPtr LowLevelMouseProc(int nCode, IntPtr wParam, IntPtr lParam) {
                     }
                 }
             } catch {
-                // fail silently
+                // we don't want exceptions to prevent passing the window message
             }
             return CallNextHookEx(mouseHook, nCode, wParam, lParam);
         }