mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

graphics() controller subid fix (win)

Browse Source
This commit is contained in:
Sebastian Hildebrandt
2021-01-25 08:21:20 +01:00
parent 19dc7a5292
commit 98f491a7c7
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/graphics.js
+9 -5
View File
@@ -720,8 +720,8 @@ function graphics(callback) {
result.controllers = parseLinesLinuxControllers(lines);
const nvidiaData = nvidiaDevices();
// needs to be rewritten ... using no spread operators
result.controllers = result.controllers.map(( controller ) => { // match by busAddress
return mergeControllerNvidia(controller, nvidiaData.find(({ pciBus }) => pciBus.endsWith(controller.busAddress)) || {} );
result.controllers = result.controllers.map((controller) => { // match by busAddress
return mergeControllerNvidia(controller, nvidiaData.find(({ pciBus }) => pciBus.endsWith(controller.busAddress)) || {});
})
}
let cmd = "clinfo --raw";
@@ -887,9 +887,13 @@ function graphics(callback) {
if (sections[i].trim() !== '') {
let lines = sections[i].trim().split('\r\n');
let subDeviceId = util.getValue(lines, 'PNPDeviceID', '=').match(/SUBSYS_[a-fA-F\d]{8}/)[0];
if (subDeviceId) {
subDeviceId = subDeviceId.split('_')[1];
let pnpDeviceId = util.getValue(lines, 'PNPDeviceID', '=').match(/SUBSYS_[a-fA-F\d]{8}/);
let subDeviceId = null;
if (pnpDeviceId) {
subDeviceId = pnpDeviceId[0];
if (subDeviceId) {
subDeviceId = subDeviceId.split('_')[1];
}
}
controllers.push({
vendor: util.getValue(lines, 'AdapterCompatibility', '='),