mir/openhardwaremonitor
2
0
Fork 0
mirror of https://github.com/openhardwaremonitor/openhardwaremonitor synced 2025-09-02 07:15:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Issue 220.

Browse Source
This commit is contained in:
Michael Möller
2011-05-15 17:06:55 +00:00
parent ac2fc9d78d
commit 3408ca9a14
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Hardware/Ring0.cs
View File

@@ -39,6 +39,7 @@ using System;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Security.AccessControl;
using System.Threading; using System.Threading;
using System.Text; using System.Text;
@@ -172,7 +173,14 @@ namespace OpenHardwareMonitor.Hardware {
if (!driver.IsOpen) if (!driver.IsOpen)
driver = null; driver = null;
isaBusMutex = new Mutex(false, "Global\\Access_ISABUS.HTP.Method"); string mutexName = "Global\\Access_ISABUS.HTP.Method";
try {
isaBusMutex = new Mutex(false, mutexName);
} catch (UnauthorizedAccessException) {
try {
isaBusMutex = Mutex.OpenExisting(mutexName, MutexRights.Synchronize);
} catch { }
}
} }
public static bool IsOpen { public static bool IsOpen {
@@ -193,7 +201,10 @@ namespace OpenHardwareMonitor.Hardware {
driver = null; driver = null;
isaBusMutex.Close(); if (isaBusMutex != null) {
isaBusMutex.Close();
isaBusMutex = null;
}
// try to delete temporary driver file again if failed during open // try to delete temporary driver file again if failed during open
if (fileName != null && File.Exists(fileName)) { if (fileName != null && File.Exists(fileName)) {
@@ -218,6 +229,8 @@ namespace OpenHardwareMonitor.Hardware {
} }
public static bool WaitIsaBusMutex(int millisecondsTimeout) { public static bool WaitIsaBusMutex(int millisecondsTimeout) {
if (isaBusMutex == null)
return true;
try { try {
return isaBusMutex.WaitOne(millisecondsTimeout, false); return isaBusMutex.WaitOne(millisecondsTimeout, false);
} catch (AbandonedMutexException) { return false; } } catch (AbandonedMutexException) { return false; }
@@ -225,6 +238,8 @@ namespace OpenHardwareMonitor.Hardware {
} }
public static void ReleaseIsaBusMutex() { public static void ReleaseIsaBusMutex() {
if (isaBusMutex == null)
return;
isaBusMutex.ReleaseMutex(); isaBusMutex.ReleaseMutex();
} }