1.1 --- a/GUI/StartupManager.cs	Mon Apr 26 18:51:22 2010 +0000
     1.2 +++ b/GUI/StartupManager.cs	Mon Apr 26 19:22:42 2010 +0000
     1.3 @@ -64,7 +64,7 @@
     1.4            ITaskFolder folder = scheduler.GetFolder("\\Open Hardware Monitor");
     1.5            IRegisteredTask task = folder.GetTask("Startup");
     1.6            startup = task != null;
     1.7 -        } catch (FileNotFoundException) {
     1.8 +        } catch (IOException) {
     1.9            startup = false;
    1.10          }
    1.11        } else {

     2.1 --- a/Hardware/CPU/CPUGroup.cs	Mon Apr 26 18:51:22 2010 +0000
     2.2 +++ b/Hardware/CPU/CPUGroup.cs	Mon Apr 26 19:22:42 2010 +0000
     2.3 @@ -114,8 +114,7 @@
     2.4              
     2.5          CPUID[][] coreThreads = GroupThreadsByCore(threads);
     2.6  
     2.7 -        this.threads[index] = coreThreads;
     2.8 -        index++;
     2.9 +        this.threads[index] = coreThreads;        
    2.10  
    2.11          switch (threads[0].Vendor) {
    2.12            case Vendor.Intel:
    2.13 @@ -134,7 +133,9 @@
    2.14              } break;
    2.15            default:
    2.16              break;
    2.17 -        } 
    2.18 +        }
    2.19 +
    2.20 +        index++;
    2.21        }
    2.22      }
    2.23      

     3.1 --- a/Hardware/Nvidia/NVAPI.cs	Mon Apr 26 18:51:22 2010 +0000
     3.2 +++ b/Hardware/Nvidia/NVAPI.cs	Mon Apr 26 19:22:42 2010 +0000
     3.3 @@ -196,7 +196,11 @@
     3.4      public static NvStatus NvAPI_GPU_GetFullName(NvPhysicalGpuHandle gpuHandle,
     3.5        out string name) {
     3.6        StringBuilder builder = new StringBuilder(SHORT_STRING_MAX);
     3.7 -      NvStatus status = _NvAPI_GPU_GetFullName(gpuHandle, builder);
     3.8 +      NvStatus status;
     3.9 +      if (_NvAPI_GPU_GetFullName != null)
    3.10 +        status = _NvAPI_GPU_GetFullName(gpuHandle, builder);
    3.11 +      else
    3.12 +        status = NvStatus.FUNCTION_NOT_FOUND;
    3.13        name = builder.ToString();
    3.14        return status;
    3.15      }