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

Merge branch 'fix/windows_version_detection' into 'master'

Browse Source 
fix NPE

See merge request sheepitrenderfarm/client!237
This commit is contained in:
Sheepit Renderfarm
2023-09-19 17:08:50 +00:00
parent 14c3e1ecc1 b34d36b830
commit 4f018c327d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/sheepit/client/os/Windows.java
View File

@@ -91,9 +91,15 @@ public class Windows extends OS {
} }
catch (NullPointerException e) { catch (NullPointerException e) {
System.err.println("Windows::isSupported Failed to extract Windows build number: " + e); System.err.println("Windows::isSupported Failed to extract Windows build number: " + e);
String ver = operatingSystem.getVersionInfo().getVersion(); var versionInfo = operatingSystem.getVersionInfo();
List<String> supportedVersions = List.of("8.1", "10", "11", "Server 2016", "Server 2012 R2", "Server 2019", "Server 2022"); if (versionInfo == null) {
return super.isSupported() && supportedVersions.contains(ver); return false;
}
else {
String ver = versionInfo.getVersion();
List<String> supportedVersions = List.of("8.1", "10", "11", "Server 2016", "Server 2012 R2", "Server 2019", "Server 2022");
return super.isSupported() && supportedVersions.contains(ver);
}
} }
return return
super.isSupported() && super.isSupported() &&