Fixed BadImageFormatExceptions.

2010-07-27 18:47:58 +00:00
parent 466c0db349
commit 492a6d938a
2 changed files with 11 additions and 6 deletions
@@ -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;
      }
    }

@@ -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);