# HG changeset patch
# User moel.mich
# Date 1272309762 0
# Node ID f8589379e32c78f83af905f0d331a26752fb572d
# Parent  25d18bbaa9cf32fec7c4c9aea566a861f2ca8ddf
Fixed a few more crash causing bugs.

diff -r 25d18bbaa9cf -r f8589379e32c GUI/StartupManager.cs
--- a/GUI/StartupManager.cs	Mon Apr 26 18:51:22 2010 +0000
+++ b/GUI/StartupManager.cs	Mon Apr 26 19:22:42 2010 +0000
@@ -64,7 +64,7 @@
           ITaskFolder folder = scheduler.GetFolder("\\Open Hardware Monitor");
           IRegisteredTask task = folder.GetTask("Startup");
           startup = task != null;
-        } catch (FileNotFoundException) {
+        } catch (IOException) {
           startup = false;
         }
       } else {
diff -r 25d18bbaa9cf -r f8589379e32c Hardware/CPU/CPUGroup.cs
--- a/Hardware/CPU/CPUGroup.cs	Mon Apr 26 18:51:22 2010 +0000
+++ b/Hardware/CPU/CPUGroup.cs	Mon Apr 26 19:22:42 2010 +0000
@@ -114,8 +114,7 @@
             
         CPUID[][] coreThreads = GroupThreadsByCore(threads);
 
-        this.threads[index] = coreThreads;
-        index++;
+        this.threads[index] = coreThreads;        
 
         switch (threads[0].Vendor) {
           case Vendor.Intel:
@@ -134,7 +133,9 @@
             } break;
           default:
             break;
-        } 
+        }
+
+        index++;
       }
     }
     
diff -r 25d18bbaa9cf -r f8589379e32c Hardware/Nvidia/NVAPI.cs
--- a/Hardware/Nvidia/NVAPI.cs	Mon Apr 26 18:51:22 2010 +0000
+++ b/Hardware/Nvidia/NVAPI.cs	Mon Apr 26 19:22:42 2010 +0000
@@ -196,7 +196,11 @@
     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;
     }