# HG changeset patch # User moel.mich # Date 1280256478 0 # Node ID f7d962d25af47dfeff57d58a1eecf7ffd764fc58 # Parent eda3e3458cf4de17cb5d4013d5fd5f1ee2ef3bc3 Fixed BadImageFormatExceptions. diff -r eda3e3458cf4 -r f7d962d25af4 Hardware/ATI/ADL.cs --- a/Hardware/ATI/ADL.cs Tue Jul 27 18:38:11 2010 +0000 +++ b/Hardware/ATI/ADL.cs Tue Jul 27 18:47:58 2010 +0000 @@ -226,12 +226,16 @@ 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 -r eda3e3458cf4 -r f7d962d25af4 Hardware/TBalancer/TBalancerGroup.cs --- a/Hardware/TBalancer/TBalancerGroup.cs Tue Jul 27 18:38:11 2010 +0000 +++ b/Hardware/TBalancer/TBalancerGroup.cs Tue Jul 27 18:47:58 2010 +0000 @@ -56,6 +56,7 @@ } 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);