From 160f0bd78318801617801106ed2e131714e6d052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=B6ller?= <mmoeller@openhardwaremonitor.org>
Date: Mon, 26 Apr 2010 19:22:42 +0000
Subject: [PATCH] Fixed a few more crash causing bugs.

---
 GUI/StartupManager.cs    | 2 +-
 Hardware/CPU/CPUGroup.cs | 7 ++++---
 Hardware/Nvidia/NVAPI.cs | 6 +++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/GUI/StartupManager.cs b/GUI/StartupManager.cs
index d447625..f7d5bf9 100644
--- a/GUI/StartupManager.cs
+++ b/GUI/StartupManager.cs
@@ -64,7 +64,7 @@ namespace OpenHardwareMonitor.GUI {
           ITaskFolder folder = scheduler.GetFolder("\\Open Hardware Monitor");
           IRegisteredTask task = folder.GetTask("Startup");
           startup = task != null;
-        } catch (FileNotFoundException) {
+        } catch (IOException) {
           startup = false;
         }
       } else {
diff --git a/Hardware/CPU/CPUGroup.cs b/Hardware/CPU/CPUGroup.cs
index 2298972..0aaa2eb 100644
--- a/Hardware/CPU/CPUGroup.cs
+++ b/Hardware/CPU/CPUGroup.cs
@@ -114,8 +114,7 @@ namespace OpenHardwareMonitor.Hardware.CPU {
             
         CPUID[][] coreThreads = GroupThreadsByCore(threads);
 
-        this.threads[index] = coreThreads;
-        index++;
+        this.threads[index] = coreThreads;        
 
         switch (threads[0].Vendor) {
           case Vendor.Intel:
@@ -134,7 +133,9 @@ namespace OpenHardwareMonitor.Hardware.CPU {
             } break;
           default:
             break;
-        } 
+        }
+
+        index++;
       }
     }
     
diff --git a/Hardware/Nvidia/NVAPI.cs b/Hardware/Nvidia/NVAPI.cs
index a45c561..410182d 100644
--- a/Hardware/Nvidia/NVAPI.cs
+++ b/Hardware/Nvidia/NVAPI.cs
@@ -196,7 +196,11 @@ namespace OpenHardwareMonitor.Hardware.Nvidia {
     public static NvStatus NvAPI_GPU_GetFullName(NvPhysicalGpuHandle gpuHandle,
       out string name) {
       StringBuilder builder = new StringBuilder(SHORT_STRING_MAX);
-      NvStatus status = _NvAPI_GPU_GetFullName(gpuHandle, builder);
+      NvStatus status;
+      if (_NvAPI_GPU_GetFullName != null)
+        status = _NvAPI_GPU_GetFullName(gpuHandle, builder);
+      else
+        status = NvStatus.FUNCTION_NOT_FOUND;
       name = builder.ToString();
       return status;
     }