Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Fix-Drive-Detect' into 'master'

Browse Source 
Fix drive detect

See merge request sheepitrenderfarm/client!267
This commit is contained in:
harlekin
2023-10-29 12:12:41 +00:00
parent ac15073fcb a87015488e
commit 20f27f3e4d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sheepit/client/hardware/hwid/impl/BaseHWInfoImpl.java
View File

@@ -7,6 +7,7 @@ import oshi.hardware.HWDiskStore;
import oshi.hardware.HardwareAbstractionLayer; import oshi.hardware.HardwareAbstractionLayer;
import oshi.hardware.NetworkIF; import oshi.hardware.NetworkIF;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
@@ -62,7 +63,8 @@ public class BaseHWInfoImpl implements BasicHWInfoStrategy {
while (rootFound == false && iterator.hasNext()) { while (rootFound == false && iterator.hasNext()) {
var drive = iterator.next(); var drive = iterator.next();
for (var partition : drive.getPartitions()) { for (var partition : drive.getPartitions()) {
if (partition.getMountPoint().equals(rootMountpoint)) { if (partition.getMountPoint().equals(rootMountpoint) || //Check "/" or "C:"
(Platform.isWindows() && partition.getMountPoint().equals(rootMountpoint + File.separator))) { //Check also "C:\" on Windows
hddSerial = drive.getSerial(); hddSerial = drive.getSerial();
rootFound = true; rootFound = true;
break; break;