From 492a6d938a37d53968b451f2c62ab6ca6dc8b711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=B6ller?= <mmoeller@openhardwaremonitor.org>
Date: Tue, 27 Jul 2010 18:47:58 +0000
Subject: [PATCH] Fixed BadImageFormatExceptions.

---
 Hardware/ATI/ADL.cs                  | 16 ++++++++++------
 Hardware/TBalancer/TBalancerGroup.cs |  1 +
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Hardware/ATI/ADL.cs b/Hardware/ATI/ADL.cs
index 00d4bbf..f71b462 100644
--- a/Hardware/ATI/ADL.cs
+++ b/Hardware/ATI/ADL.cs
@@ -226,12 +226,16 @@ namespace OpenHardwareMonitor.Hardware.ATI {
 
     public static int ADL_Main_Control_Create(int enumConnectedAdapters) {
       try {
-        return _ADL_Main_Control_Create(Main_Memory_Alloc,
-          enumConnectedAdapters);
-      } catch (DllNotFoundException) {
-        CreateDelegates("atiadlxy");
-        return _ADL_Main_Control_Create(Main_Memory_Alloc,
-          enumConnectedAdapters);
+        try {
+          return _ADL_Main_Control_Create(Main_Memory_Alloc,
+            enumConnectedAdapters);
+        } catch {
+          CreateDelegates("atiadlxy");
+          return _ADL_Main_Control_Create(Main_Memory_Alloc,
+            enumConnectedAdapters);
+        }
+      } catch {
+        return ADL.ADL_ERR;
       }
     }
 
diff --git a/Hardware/TBalancer/TBalancerGroup.cs b/Hardware/TBalancer/TBalancerGroup.cs
index 126c5a1..56e0cbf 100644
--- a/Hardware/TBalancer/TBalancerGroup.cs
+++ b/Hardware/TBalancer/TBalancerGroup.cs
@@ -56,6 +56,7 @@ namespace OpenHardwareMonitor.Hardware.TBalancer {
       } catch (DllNotFoundException) { return; } 
         catch (ArgumentNullException) { return; }
         catch (EntryPointNotFoundException) { return; }
+        catch (BadImageFormatException) { return; }
      
       FT_DEVICE_INFO_NODE[] info = new FT_DEVICE_INFO_NODE[numDevices];
       FTD2XX.FT_GetDeviceInfoList(info, ref numDevices);