mir/openhardwaremonitor
2
0
Fork 0
mirror of https://github.com/openhardwaremonitor/openhardwaremonitor synced 2025-09-01 06:45:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed the HDD enumeration code to drop drives without smart support and without any non-zero-sized logical drives.

Browse Source
This commit is contained in:
Michael Möller
2013-06-30 16:24:52 +00:00
parent 67354b4125
commit 97e0a9c86f
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Hardware/HDD/AbstractHarddrive.cs
View File

@@ -71,7 +71,10 @@ namespace OpenHardwareMonitor.Hardware.HDD {
DriveInfo di = new DriveInfo(logicalDrive); DriveInfo di = new DriveInfo(logicalDrive);
if (di.TotalSize > 0) if (di.TotalSize > 0)
driveInfoList.Add(new DriveInfo(logicalDrive)); driveInfoList.Add(new DriveInfo(logicalDrive));
} catch (ArgumentException) { } catch (IOException) { } } catch (ArgumentException) {
} catch (IOException) {
} catch (UnauthorizedAccessException) {
}
} }
driveInfos = driveInfoList.ToArray(); driveInfos = driveInfoList.ToArray();
@@ -105,6 +108,23 @@ namespace OpenHardwareMonitor.Hardware.HDD {
string[] logicalDrives = smart.GetLogicalDrives(driveIndex); string[] logicalDrives = smart.GetLogicalDrives(driveIndex);
if (logicalDrives == null || logicalDrives.Length == 0) if (logicalDrives == null || logicalDrives.Length == 0)
return null; return null;
bool hasNonZeroSizeDrive = false;
foreach (string logicalDrive in logicalDrives) {
try {
DriveInfo di = new DriveInfo(logicalDrive);
if (di.TotalSize > 0) {
hasNonZeroSizeDrive = true;
break;
}
} catch (ArgumentException) {
} catch (IOException) {
} catch (UnauthorizedAccessException) {
}
}
if (!hasNonZeroSizeDrive)
return null;
} }
if (string.IsNullOrEmpty(name)) if (string.IsNullOrEmpty(name))